diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2015-09-20 23:11:39 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2015-09-20 23:11:39 +0200 |
| commit | a44c4b82de44af9aec59c542f3212795ecc52b57 (patch) | |
| tree | 97efb04962b7936b0ab270aebfbaa72ad0a7f447 | |
| parent | 5c3ef84a0ba3cde0d9e2586fcb618d81851776f5 (diff) | |
| download | irssi-a44c4b82de44af9aec59c542f3212795ecc52b57.zip | |
More format warnings removed.
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 7 | ||||
| -rw-r--r-- | src/irc/core/irc-channels.c | 12 | ||||
| -rw-r--r-- | src/irc/core/servers-redirect.c | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index a475f056..341902df 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -326,8 +326,11 @@ static void autoconnect_servers(void) if (autocon_server != NULL) { /* connect to specified server */ - str = g_strdup_printf(autocon_password == NULL ? "%s %d" : "%s %d %s", - autocon_server, autocon_port, autocon_password); + if (autocon_password == NULL) + str = g_strdup_printf("%s %d", autocon_server, autocon_port); + else + str = g_strdup_printf("%s %d %s", autocon_server, autocon_port, autocon_password); + signal_emit("command connect", 1, str); g_free(str); return; diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index add18acf..682be4c2 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -146,11 +146,13 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data, continue; } if (outchans->len > 0) { - g_string_truncate(outchans, outchans->len-1); - g_string_truncate(outkeys, outkeys->len-1); - irc_send_cmdv(IRC_SERVER(server), - use_keys ? "JOIN %s %s" : "JOIN %s", - outchans->str, outkeys->str); + g_string_truncate(outchans, outchans->len - 1); + g_string_truncate(outkeys, outkeys->len - 1); + + if (use_keys) + irc_send_cmdv(IRC_SERVER(server), "JOIN %s %s", outchans->str, outkeys->str); + else + irc_send_cmdv(IRC_SERVER(server), "JOIN %s", outchans->str); } cmdlen = 0; g_string_truncate(outchans,0); diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c index f0a285df..aeb9c010 100644 --- a/src/irc/core/servers-redirect.c +++ b/src/irc/core/servers-redirect.c @@ -433,9 +433,11 @@ static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec) if (rec->aborted || !rec->destroyed) { /* emit the failure signal */ - str = g_strdup_printf(rec->failure_signal != NULL ? - "FAILED %s: %s" : "FAILED %s", - rec->cmd->name, rec->failure_signal); + if (rec->failure_signal != NULL) + str = g_strdup_printf("FAILED %s: %s", rec->cmd->name, rec->failure_signal); + else + str = g_strdup_printf("FAILED %s", rec->cmd->name); + rawlog_redirect(server->rawlog, str); g_free(str); |