diff options
| author | Alexander Færøy <ahf@irssi.org> | 2009-02-08 17:57:19 +0000 |
|---|---|---|
| committer | ahf <ahf@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2009-02-08 17:57:19 +0000 |
| commit | 2fffcf5a77167e03e267664e559267c8fa1d972d (patch) | |
| tree | 716e80f8ef45590b14c002a6baa4799c494311f3 /src/irc/core | |
| parent | c561ba35e6aa382124147e88f45683c0021db02f (diff) | |
| download | irssi-2fffcf5a77167e03e267664e559267c8fa1d972d.zip | |
Code Cleanup:
Use g_string_printf() instead of g_string_sprintf() (which is considered deprecated.)
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5004 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core')
| -rw-r--r-- | src/irc/core/ctcp.c | 2 | ||||
| -rw-r--r-- | src/irc/core/irc-commands.c | 14 | ||||
| -rw-r--r-- | src/irc/core/modes.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c index cc4bd6ca..06fad103 100644 --- a/src/irc/core/ctcp.c +++ b/src/irc/core/ctcp.c @@ -206,7 +206,7 @@ static void ctcp_clientinfo(IRC_SERVER_REC *server, const char *data, g_return_if_fail(nick != NULL); str = g_string_new(NULL); - g_string_sprintf(str, "NOTICE %s :\001CLIENTINFO", nick); + g_string_printf(str, "NOTICE %s :\001CLIENTINFO", nick); for (tmp = ctcp_cmds; tmp != NULL; tmp = tmp->next) { CTCP_CMD_REC *rec = tmp->data; diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index e51aa111..8ee5c9bd 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -78,7 +78,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server, cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); recoded = recode_out(SERVER(server), msg, target); - g_string_sprintf(tmpstr, "NOTICE %s :%s", target, recoded); + g_string_printf(tmpstr, "NOTICE %s :%s", target, recoded); g_free(recoded); irc_send_cmd_split(server, tmpstr->str, 2, server->max_msgs_in_cmd); @@ -106,12 +106,12 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server, g_strup(ctcpcmd); if (*ctcpdata == '\0') - g_string_sprintf(tmpstr, "PRIVMSG %s :\001%s\001", target, ctcpcmd); + g_string_printf(tmpstr, "PRIVMSG %s :\001%s\001", target, ctcpcmd); else { char *recoded; recoded = recode_out(SERVER(server), ctcpdata, target); - g_string_sprintf(tmpstr, "PRIVMSG %s :\001%s %s\001", target, ctcpcmd, recoded); + g_string_printf(tmpstr, "PRIVMSG %s :\001%s %s\001", target, ctcpcmd, recoded); g_free(recoded); } @@ -140,7 +140,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server, g_strup(ctcpcmd); recoded = recode_out(SERVER(server), ctcpdata, target); - g_string_sprintf(tmpstr, "NOTICE %s :\001%s %s\001", target, ctcpcmd, recoded); + g_string_printf(tmpstr, "NOTICE %s :\001%s %s\001", target, ctcpcmd, recoded); g_free(recoded); irc_send_cmd_split(server, tmpstr->str, 2, server->max_msgs_in_cmd); @@ -194,7 +194,7 @@ static void cmd_kick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item if (!ischannel(*channame)) cmd_param_error(CMDERR_NOT_JOINED); recoded = recode_out(SERVER(server), reason, channame); - g_string_sprintf(tmpstr, "KICK %s %s :%s", channame, nicks, recoded); + g_string_printf(tmpstr, "KICK %s %s :%s", channame, nicks, recoded); g_free(recoded); irc_send_cmd_split(server, tmpstr->str, 3, server->max_kicks_in_cmd); @@ -415,9 +415,9 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server, event_402 = "event 402"; if (*qserver == '\0') - g_string_sprintf(tmpstr, "WHOIS %s", query); + g_string_printf(tmpstr, "WHOIS %s", query); else { - g_string_sprintf(tmpstr, "WHOIS %s %s", qserver, query); + g_string_printf(tmpstr, "WHOIS %s %s", qserver, query); if (g_strcasecmp(qserver, query) == 0) event_402 = "whois event not found"; } diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index 38b457a2..f204c801 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -569,7 +569,7 @@ void channel_set_singlemode(IRC_CHANNEL_REC *channel, const char *nicks, if (num == 0) { - g_string_sprintf(str, "MODE %s %s", + g_string_printf(str, "MODE %s %s", channel->name, mode); modepos = str->len; } else { |