diff options
30 files changed, 86 insertions, 86 deletions
diff --git a/src/core/channels.c b/src/core/channels.c index 04c36744..907d363b 100644 --- a/src/core/channels.c +++ b/src/core/channels.c @@ -206,7 +206,7 @@ static void event_connected(SERVER_REC *server) /* check that we haven't already joined this channel in same chat network connection.. */ if (channel_find_servers(chatnet_servers, rec->name) == NULL) - g_string_sprintfa(chans, "%s,", rec->name); + g_string_append_printf(chans, "%s,", rec->name); } g_slist_free(chatnet_servers); diff --git a/src/core/levels.c b/src/core/levels.c index 4345d4b6..73743352 100644 --- a/src/core/levels.c +++ b/src/core/levels.c @@ -137,7 +137,7 @@ char *bits2level(int bits) for (n = 0; levels[n] != NULL; n++) { if (bits & (1L << n)) - g_string_sprintfa(str, "%s ", levels[n]); + g_string_append_printf(str, "%s ", levels[n]); } if (str->len > 0) g_string_truncate(str, str->len-1); diff --git a/src/core/session.c b/src/core/session.c index 5eb5270b..96a809ff 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -284,7 +284,7 @@ static void sig_session_save(CONFIG_REC *config) /* save pids */ str = g_string_new(NULL); for (tmp = pidwait_get_pids(); tmp != NULL; tmp = tmp->next) - g_string_sprintfa(str, "%d ", GPOINTER_TO_INT(tmp->data)); + g_string_append_printf(str, "%d ", GPOINTER_TO_INT(tmp->data)); config_node_set_str(config, config->mainnode, "pids", str->str); g_string_free(str, TRUE); } diff --git a/src/core/settings.c b/src/core/settings.c index f6467744..902d4cf6 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -515,7 +515,7 @@ void settings_check_module(const char *module) continue; if (set == NULL || strcmp(set->module, module) != 0) { - g_string_sprintfa(errors, " %s", node->key); + g_string_append_printf(errors, " %s", node->key); count++; } } diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index cc6f200f..061d68ca 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -207,7 +207,7 @@ static void cmd_channel_list_joined(void) for (ntmp = nicklist; ntmp != NULL; ntmp = ntmp->next) { NICK_REC *rec = ntmp->data; - g_string_sprintfa(nicks, "%s ", rec->nick); + g_string_append_printf(nicks, "%s ", rec->nick); } if (nicks->len > 1) g_string_truncate(nicks, nicks->len-1); @@ -235,9 +235,9 @@ static void cmd_channel_list(void) if (rec->autojoin) g_string_append(str, "autojoin, "); if (rec->botmasks != NULL && *rec->botmasks != '\0') - g_string_sprintfa(str, "bots: %s, ", rec->botmasks); + g_string_append_printf(str, "bots: %s, ", rec->botmasks); if (rec->autosendcmd != NULL && *rec->autosendcmd != '\0') - g_string_sprintfa(str, "botcmd: %s, ", rec->autosendcmd); + g_string_append_printf(str, "botcmd: %s, ", rec->autosendcmd); if (str->len > 2) g_string_truncate(str, str->len-2); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_CHANSETUP_LINE, @@ -564,7 +564,7 @@ static void cmd_names(const char *data, SERVER_REC *server, WI_ITEM_REC *item) for (tmp = channels; *tmp != NULL; tmp++) { chanrec = channel_find(server, *tmp); if (chanrec == NULL) - g_string_sprintfa(unknowns, "%s,", *tmp); + g_string_append_printf(unknowns, "%s,", *tmp); else { fe_channels_nicklist(chanrec, flags); signal_stop(); diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c index 8120479c..86f62489 100644 --- a/src/fe-common/core/fe-core-commands.c +++ b/src/fe-common/core/fe-core-commands.c @@ -319,7 +319,7 @@ static void event_list_subcommands(const char *command) if (g_strncasecmp(rec->cmd, command, len) == 0 && rec->cmd[len] == ' ' && strchr(rec->cmd+len+1, ' ') == NULL) { - g_string_sprintfa(str, "%s ", rec->cmd+len+1); + g_string_append_printf(str, "%s ", rec->cmd+len+1); } } diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c index 23a942c9..e39de875 100644 --- a/src/fe-common/core/fe-ignore.c +++ b/src/fe-common/core/fe-ignore.c @@ -64,9 +64,9 @@ static void ignore_print(int index, IGNORE_REC *rec) if (rec->fullword) g_string_append(options, "-full "); if (rec->replies) g_string_append(options, "-replies "); if (rec->servertag != NULL) - g_string_sprintfa(options, "-network %s ", rec->servertag); + g_string_append_printf(options, "-network %s ", rec->servertag); if (rec->pattern != NULL) - g_string_sprintfa(options, "-pattern %s ", rec->pattern); + g_string_append_printf(options, "-pattern %s ", rec->pattern); if (options->len > 1) g_string_truncate(options, options->len-1); diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c index 61b7a316..ed1d4d7d 100644 --- a/src/fe-common/core/fe-log.c +++ b/src/fe-common/core/fe-log.c @@ -200,11 +200,11 @@ static char *log_items_get_list(LOG_REC *log) for (tmp = log->items; tmp != NULL; tmp = tmp->next) { rec = tmp->data; - g_string_sprintfa(str, "%s, ", rec->name); + g_string_append_printf(str, "%s, ", rec->name); } g_string_truncate(str, str->len-2); if(rec->servertag != NULL) - g_string_sprintfa(str, " (%s)", rec->servertag); + g_string_append_printf(str, " (%s)", rec->servertag); ret = str->str; g_string_free(str, FALSE); diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index 1035c7bb..9b50c1a9 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -371,7 +371,7 @@ static void sig_message_quit(SERVER_REC *server, const char *nick, print_channel = rec->visible_name; if (once) - g_string_sprintfa(chans, "%s,", rec->visible_name); + g_string_append_printf(chans, "%s,", rec->visible_name); else { window = window_item_window((WI_ITEM_REC *) rec); if (g_slist_find(windows, window) == NULL) { diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index cd71364b..a043d60f 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -491,11 +491,11 @@ static void hilight_print(int index, HILIGHT_REC *rec) } if (rec->priority != 0) - g_string_sprintfa(options, "-priority %d ", rec->priority); + g_string_append_printf(options, "-priority %d ", rec->priority); if (rec->color != NULL) - g_string_sprintfa(options, "-color %s ", rec->color); + g_string_append_printf(options, "-color %s ", rec->color); if (rec->act_color != NULL) - g_string_sprintfa(options, "-actcolor %s ", rec->act_color); + g_string_append_printf(options, "-actcolor %s ", rec->act_color); chans = rec->channels == NULL ? NULL : g_strjoinv(",", rec->channels); diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c index c3ceb7fd..d3653f90 100644 --- a/src/fe-common/core/printtext.c +++ b/src/fe-common/core/printtext.c @@ -226,31 +226,31 @@ static char *printtext_get_args(TEXT_DEST_REC *dest, const char *str, } case 'd': { int d = (int) va_arg(va, int); - g_string_sprintfa(out, "%d", d); + g_string_append_printf(out, "%d", d); break; } case 'f': { double f = (double) va_arg(va, double); - g_string_sprintfa(out, "%0.2f", f); + g_string_append_printf(out, "%0.2f", f); break; } case 'u': { unsigned int d = (unsigned int) va_arg(va, unsigned int); - g_string_sprintfa(out, "%u", d); + g_string_append_printf(out, "%u", d); break; } case 'l': { long d = (long) va_arg(va, long); if (*++str != 'd' && *str != 'u') { - g_string_sprintfa(out, "%ld", d); + g_string_append_printf(out, "%ld", d); str--; } else { if (*str == 'd') - g_string_sprintfa(out, "%ld", d); + g_string_append_printf(out, "%ld", d); else - g_string_sprintfa(out, "%lu", d); + g_string_append_printf(out, "%lu", d); } break; } diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c index 762d42d1..9bc68762 100644 --- a/src/fe-common/irc/fe-irc-server.c +++ b/src/fe-common/irc/fe-irc-server.c @@ -109,26 +109,26 @@ static void cmd_server_list(const char *data) if (rec->use_ssl) { g_string_append(str, "ssl, "); if (rec->ssl_cert) { - g_string_sprintfa(str, "ssl_cert: %s, ", rec->ssl_cert); + g_string_append_printf(str, "ssl_cert: %s, ", rec->ssl_cert); if (rec->ssl_pkey) - g_string_sprintfa(str, "ssl_pkey: %s, ", rec->ssl_pkey); + g_string_append_printf(str, "ssl_pkey: %s, ", rec->ssl_pkey); } if (rec->ssl_verify) g_string_append(str, "ssl_verify, "); if (rec->ssl_cafile) - g_string_sprintfa(str, "ssl_cafile: %s, ", rec->ssl_cafile); + g_string_append_printf(str, "ssl_cafile: %s, ", rec->ssl_cafile); if (rec->ssl_capath) - g_string_sprintfa(str, "ssl_capath: %s, ", rec->ssl_capath); + g_string_append_printf(str, "ssl_capath: %s, ", rec->ssl_capath); } if (rec->max_cmds_at_once > 0) - g_string_sprintfa(str, "cmdmax: %d, ", rec->max_cmds_at_once); + g_string_append_printf(str, "cmdmax: %d, ", rec->max_cmds_at_once); if (rec->cmd_queue_speed > 0) - g_string_sprintfa(str, "cmdspeed: %d, ", rec->cmd_queue_speed); + g_string_append_printf(str, "cmdspeed: %d, ", rec->cmd_queue_speed); if (rec->max_query_chans > 0) - g_string_sprintfa(str, "querychans: %d, ", rec->max_query_chans); + g_string_append_printf(str, "querychans: %d, ", rec->max_query_chans); if (rec->own_host != NULL) - g_string_sprintfa(str, "host: %s, ", rec->own_host); + g_string_append_printf(str, "host: %s, ", rec->own_host); if (str->len > 1) g_string_truncate(str, str->len-2); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_SETUPSERVER_LINE, diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c index 3b39f3a5..b35ae898 100644 --- a/src/fe-common/irc/fe-ircnet.c +++ b/src/fe-common/irc/fe-ircnet.c @@ -45,33 +45,33 @@ static void cmd_network_list(void) g_string_truncate(str, 0); if (rec->nick != NULL) - g_string_sprintfa(str, "nick: %s, ", rec->nick); + g_string_append_printf(str, "nick: %s, ", rec->nick); if (rec->username != NULL) - g_string_sprintfa(str, "username: %s, ", rec->username); + g_string_append_printf(str, "username: %s, ", rec->username); if (rec->realname != NULL) - g_string_sprintfa(str, "realname: %s, ", rec->realname); + g_string_append_printf(str, "realname: %s, ", rec->realname); if (rec->own_host != NULL) - g_string_sprintfa(str, "host: %s, ", rec->own_host); + g_string_append_printf(str, "host: %s, ", rec->own_host); if (rec->autosendcmd != NULL) - g_string_sprintfa(str, "autosendcmd: %s, ", rec->autosendcmd); + g_string_append_printf(str, "autosendcmd: %s, ", rec->autosendcmd); if (rec->usermode != NULL) - g_string_sprintfa(str, "usermode: %s, ", rec->usermode); + g_string_append_printf(str, "usermode: %s, ", rec->usermode); if (rec->cmd_queue_speed > 0) - g_string_sprintfa(str, "cmdspeed: %d, ", rec->cmd_queue_speed); + g_string_append_printf(str, "cmdspeed: %d, ", rec->cmd_queue_speed); if (rec->max_cmds_at_once > 0) - g_string_sprintfa(str, "cmdmax: %d, ", rec->max_cmds_at_once); + g_string_append_printf(str, "cmdmax: %d, ", rec->max_cmds_at_once); if (rec->max_query_chans > 0) - g_string_sprintfa(str, "querychans: %d, ", rec->max_query_chans); + g_string_append_printf(str, "querychans: %d, ", rec->max_query_chans); if (rec->max_kicks > 0) - g_string_sprintfa(str, "max_kicks: %d, ", rec->max_kicks); + g_string_append_printf(str, "max_kicks: %d, ", rec->max_kicks); if (rec->max_msgs > 0) - g_string_sprintfa(str, "max_msgs: %d, ", rec->max_msgs); + g_string_append_printf(str, "max_msgs: %d, ", rec->max_msgs); if (rec->max_modes > 0) - g_string_sprintfa(str, "max_modes: %d, ", rec->max_modes); + g_string_append_printf(str, "max_modes: %d, ", rec->max_modes); if (rec->max_whois > 0) - g_string_sprintfa(str, "max_whois: %d, ", rec->max_whois); + g_string_append_printf(str, "max_whois: %d, ", rec->max_whois); if (str->len > 1) g_string_truncate(str, str->len-2); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c index 006669e8..35ee43f5 100644 --- a/src/fe-common/irc/fe-netjoin.c +++ b/src/fe-common/irc/fe-netjoin.c @@ -200,7 +200,7 @@ static void print_netjoins(NETJOIN_SERVER_REC *server) if (*channel != ' ') g_string_append_c(temp->nicks, *channel); - g_string_sprintfa(temp->nicks, "%s, ", + g_string_append_printf(temp->nicks, "%s, ", rec->nick); } diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index bf5ba56b..788f6d00 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -134,7 +134,7 @@ static void get_server_splits(void *key, NETSPLIT_REC *split, g_string_append_c(chanrec->nicks, '@'); else if (splitchan->voice) g_string_append_c(chanrec->nicks, '+'); - g_string_sprintfa(chanrec->nicks, "%s, ", split->nick); + g_string_append_printf(chanrec->nicks, "%s, ", split->nick); if (chanrec->nick_count == netsplit_max_nicks) chanrec->maxnickpos = chanrec->nicks->len; @@ -153,7 +153,7 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec) NETSPLIT_SERVER_REC *rec = tmp->data; if (rec->prints > 0) { - g_string_sprintfa(destservers, "%s, ", + g_string_append_printf(destservers, "%s, ", rec->destserver); } } diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c index 036c07e9..1cfe9ed4 100644 --- a/src/fe-common/irc/notifylist/fe-notifylist.c +++ b/src/fe-common/irc/notifylist/fe-notifylist.c @@ -71,7 +71,7 @@ static void print_notify_onserver(IRC_SERVER_REC *server, GSList *nicks, if (!notifylist_ison_server(server, nick)) continue; - g_string_sprintfa(str, "%s, ", nick); + g_string_append_printf(str, "%s, ", nick); *offline = g_slist_remove(*offline, nick); } @@ -133,7 +133,7 @@ static void cmd_notify_show(void) str = g_string_new(NULL); for (tmp = offline; tmp != NULL; tmp = tmp->next) - g_string_sprintfa(str, "%s, ", (char *) tmp->data); + g_string_append_printf(str, "%s, ", (char *) tmp->data); g_string_truncate(str, str->len-2); printformat(NULL,NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NOTIFY_OFFLINE, str->str); diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c index d70811f2..6cb567cc 100644 --- a/src/fe-text/mainwindows.c +++ b/src/fe-text/mainwindows.c @@ -1028,7 +1028,7 @@ static void windows_print_sticky(WINDOW_REC *win) for (tmp = list; tmp != NULL; tmp = tmp->next) { WINDOW_REC *rec = tmp->data; - g_string_sprintfa(str, "#%d, ", rec->refnum); + g_string_append_printf(str, "#%d, ", rec->refnum); } g_string_truncate(str, str->len-2); g_slist_free(list); diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c index d81890e1..68724293 100644 --- a/src/fe-text/statusbar.c +++ b/src/fe-text/statusbar.c @@ -648,7 +648,7 @@ static GString *finalize_string(const char *str, const char *color) (term_type == TERM_TYPE_8BIT && (unsigned char) (*str & 0x7f) < 32)) { /* control char */ - g_string_sprintfa(out, "%%8%c%%8", + g_string_append_printf(out, "%%8%c%%8", 'A'-1 + (*str & 0x7f)); } else if (*str == '%' && str[1] == 'n') { g_string_append(out, color); diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c index f078e90e..0ba7d16e 100644 --- a/src/fe-text/textbuffer.c +++ b/src/fe-text/textbuffer.c @@ -372,11 +372,11 @@ static void set_color(GString *str, int cmd) if ((cmd & LINE_COLOR_BG) == 0) { /* change foreground color */ - g_string_sprintfa(str, "\004%c%c", + g_string_append_printf(str, "\004%c%c", color, FORMAT_COLOR_NOCHANGE); } else { /* change background color */ - g_string_sprintfa(str, "\004%c%c", + g_string_append_printf(str, "\004%c%c", FORMAT_COLOR_NOCHANGE, color); } } @@ -429,19 +429,19 @@ void textbuffer_line2text(LINE_REC *line, int coloring, GString *str) g_string_append_c(str, 22); break; case LINE_CMD_BLINK: - g_string_sprintfa(str, "\004%c", + g_string_append_printf(str, "\004%c", FORMAT_STYLE_BLINK); break; case LINE_CMD_BOLD: - g_string_sprintfa(str, "\004%c", + g_string_append_printf(str, "\004%c", FORMAT_STYLE_BOLD); break; case LINE_CMD_COLOR0: - g_string_sprintfa(str, "\004%c%c", + g_string_append_printf(str, "\004%c%c", '0', FORMAT_COLOR_NOCHANGE); break; case LINE_CMD_INDENT: - g_string_sprintfa(str, "\004%c", + g_string_append_printf(str, "\004%c", FORMAT_STYLE_INDENT); break; } diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index 2cdd788b..1d46acb8 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -90,14 +90,14 @@ char *ban_get_masks(IRC_CHANNEL_REC *channel, const char *nicks, int ban_type) for (ban = banlist; *ban != NULL; ban++) { if (strchr(*ban, '!') != NULL) { /* explicit ban */ - g_string_sprintfa(str, "%s ", *ban); + g_string_append_printf(str, "%s ", *ban); continue; } /* ban nick */ realban = ban_get_mask(channel, *ban, ban_type); if (realban != NULL) { - g_string_sprintfa(str, "%s ", realban); + g_string_append_printf(str, "%s ", realban); g_free(realban); } } @@ -143,7 +143,7 @@ void ban_remove(IRC_CHANNEL_REC *channel, const char *bans) rec = tmp->data; if (match_wildcards(*ban, rec->ban)) { - g_string_sprintfa(str, "%s ", rec->ban); + g_string_append_printf(str, "%s ", rec->ban); found = TRUE; } } @@ -161,7 +161,7 @@ void ban_remove(IRC_CHANNEL_REC *channel, const char *bans) atoi(*ban)-1); } if (rec != NULL) - g_string_sprintfa(str, "%s ", rec->ban); + g_string_append_printf(str, "%s ", rec->ban); else if (!channel->synced) g_warning("channel %s is not synced", channel->name); } diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c index 30e60d19..c9528edc 100644 --- a/src/irc/core/channel-rejoin.c +++ b/src/irc/core/channel-rejoin.c @@ -215,11 +215,11 @@ static void server_rejoin_channels(IRC_SERVER_REC *server) } rec->joining = TRUE; - g_string_sprintfa(channels, "%s,", rec->channel); + g_string_append_printf(channels, "%s,", rec->channel); if (rec->key == NULL) g_string_append(keys, "x,"); else { - g_string_sprintfa(keys, "%s,", rec->key); + g_string_append_printf(keys, "%s,", rec->key); use_keys = TRUE; } } @@ -228,7 +228,7 @@ static void server_rejoin_channels(IRC_SERVER_REC *server) g_string_truncate(channels, channels->len-1); g_string_truncate(keys, keys->len-1); - if (use_keys) g_string_sprintfa(channels, " %s", keys->str); + if (use_keys) g_string_append_printf(channels, " %s", keys->str); server->channels_join(SERVER(server), channels->str, TRUE); } diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index 99775d30..dd6e29ce 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -106,7 +106,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data, if (chanrec == NULL) { schannel = channel_setup_find(channel, server->connrec->chatnet); - g_string_sprintfa(outchans, "%s,", channel); + g_string_append_printf(outchans, "%s,", channel); if (*tmpkey != NULL && **tmpkey != '\0') key = *tmpkey; else if (schannel != NULL && schannel->password != NULL) { @@ -115,7 +115,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data, key = schannel->password; } else key = NULL; - g_string_sprintfa(outkeys, "%s,", get_join_key(key)); + g_string_append_printf(outkeys, "%s,", get_join_key(key)); channame = channel + (channel[0] == '!' && channel[1] == '!'); chanrec = irc_channel_create(server, channame, NULL, diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 6dbd64aa..d0e38640 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -476,8 +476,8 @@ char *irc_server_get_channels(IRC_SERVER_REC *server) for (tmp = server->channels; tmp != NULL; tmp = tmp->next) { CHANNEL_REC *channel = tmp->data; - g_string_sprintfa(chans, "%s,", channel->name); - g_string_sprintfa(keys, "%s,", channel->key == NULL ? "x" : + g_string_append_printf(chans, "%s,", channel->name); + g_string_append_printf(keys, "%s,", channel->key == NULL ? "x" : channel->key); if (channel->key != NULL) use_keys = TRUE; @@ -487,8 +487,8 @@ char *irc_server_get_channels(IRC_SERVER_REC *server) for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) { REJOIN_REC *rec = tmp->data; - g_string_sprintfa(chans, "%s,", rec->channel); - g_string_sprintfa(keys, "%s,", rec->key == NULL ? "x" : + g_string_append_printf(chans, "%s,", rec->channel); + g_string_append_printf(keys, "%s,", rec->key == NULL ? "x" : rec->key); if (rec->key != NULL) use_keys = TRUE; } @@ -496,7 +496,7 @@ char *irc_server_get_channels(IRC_SERVER_REC *server) if (chans->len > 0) { g_string_truncate(chans, chans->len-1); g_string_truncate(keys, keys->len-1); - if (use_keys) g_string_sprintfa(chans, " %s", keys->str); + if (use_keys) g_string_append_printf(chans, " %s", keys->str); } ret = chans->str; diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c index 0286df79..caa9b010 100644 --- a/src/irc/core/irc.c +++ b/src/irc/core/irc.c @@ -202,7 +202,7 @@ void irc_send_cmd_split(IRC_SERVER_REC *server, const char *cmd, tmp = nicklist; for (;; tmp++) { if (*tmp != NULL) { - g_string_sprintfa(nickstr, "%s,", *tmp); + g_string_append_printf(nickstr, "%s,", *tmp); if (++count < max_nicks) continue; } diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index 17464a16..38b457a2 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -577,7 +577,7 @@ void channel_set_singlemode(IRC_CHANNEL_REC *channel, const char *nicks, g_string_insert(str, modepos, mode); } - g_string_sprintfa(str, " %s", *nick); + g_string_append_printf(str, " %s", *nick); if (++num == channel->server->max_modes_in_cmd) { /* max. modes / command reached, send to server */ @@ -659,7 +659,7 @@ void channel_set_mode(IRC_SERVER_REC *server, const char *channel, } if (*arg != '\0') - g_string_sprintfa(targs, " %s", arg); + g_string_append_printf(targs, " %s", arg); } } @@ -695,7 +695,7 @@ static int get_wildcard_nicks(GString *output, const char *mask, if (g_strcasecmp(rec->nick, channel->server->nick) == 0) continue; - g_string_sprintfa(output, "%s ", rec->nick); + g_string_append_printf(output, "%s ", rec->nick); count++; } g_slist_free(nicks); @@ -734,7 +734,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item, if (strchr(*match, '*') == NULL && strchr(*match, '?') == NULL) { /* no wildcards */ - g_string_sprintfa(str, "%s ", *match); + g_string_append_printf(str, "%s ", *match); } else { count = get_wildcard_nicks(str, *match, channel, op, voice); diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index bedfc10f..ba09bb57 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -135,7 +135,7 @@ static void notifylist_timeout_server(IRC_SERVER_REC *server) if (cmd->len+len+1 > 510) ison_send(server, cmd); - g_string_sprintfa(cmd, "%s ", nick); + g_string_append_printf(cmd, "%s ", nick); g_free(nick); } @@ -211,7 +211,7 @@ static void whois_list_send(IRC_SERVER_REC *server, GSList *nicks) nick = tmp->data; count++; - g_string_sprintfa(str, "%s,", nick); + g_string_append_printf(str, "%s,", nick); if (count >= server->max_whois_in_cmd) { g_string_truncate(str, str->len-1); diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c index 5829023d..17ba382d 100644 --- a/src/irc/proxy/dump.c +++ b/src/irc/proxy/dump.c @@ -222,9 +222,9 @@ void proxy_client_reset_nick(CLIENT_REC *client) static void proxy_dump_data_005(gpointer key, gpointer value, gpointer context) { if (*(char *)value != '\0') - g_string_sprintfa(context, "%s=%s ", (char *)key, (char *)value); + g_string_append_printf(context, "%s=%s ", (char *)key, (char *)value); else - g_string_sprintfa(context, "%s ", (char *)key); + g_string_append_printf(context, "%s ", (char *)key); } void proxy_dump_data(CLIENT_REC *client) @@ -259,7 +259,7 @@ void proxy_dump_data(CLIENT_REC *client) for (;; tmp++) { if (*tmp != NULL) { - g_string_sprintfa(paramstr, "%s ", *tmp); + g_string_append_printf(paramstr, "%s ", *tmp); if (++count < 15) continue; } @@ -267,7 +267,7 @@ void proxy_dump_data(CLIENT_REC *client) count = 0; if (paramstr->len > 0) g_string_truncate(paramstr, paramstr->len-1); - g_string_sprintfa(paramstr, " :are supported by this server\n"); + g_string_append_printf(paramstr, " :are supported by this server\n"); proxy_outdata(client, "%s", paramstr->str); g_string_truncate(paramstr, 0); g_string_sprintf(paramstr, ":%s 005 %s ", client->proxy_address, client->nick); diff --git a/src/lib-config/get.c b/src/lib-config/get.c index 5f429a82..c0f6a3dd 100644 --- a/src/lib-config/get.c +++ b/src/lib-config/get.c @@ -214,7 +214,7 @@ char **config_node_get_list(CONFIG_NODE *node) node = tmp->data; if (node->type == NODE_TYPE_VALUE) - g_string_sprintfa(values, "%s ", (char *) node->value); + g_string_append_printf(values, "%s ", (char *) node->value); } /* split the values to **str array */ diff --git a/src/lib-config/write.c b/src/lib-config/write.c index 5a06b177..85bd0406 100644 --- a/src/lib-config/write.c +++ b/src/lib-config/write.c @@ -98,9 +98,9 @@ static char *config_escape_string(const char *text) str = g_string_new("\""); while (*text != '\0') { if (*text == '\\' || *text == '"') - g_string_sprintfa(str, "\\%c", *text); + g_string_append_printf(str, "\\%c", *text); else if ((unsigned char) *text < 32) - g_string_sprintfa(str, "\\%03o", *text); + g_string_append_printf(str, "\\%03o", *text); else g_string_append_c(str, *text); text++; diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index e13c2cf3..de7fb2ad 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -236,7 +236,7 @@ char *perl_get_use_list(void) g_string_append(str, "use Irssi::UI;"); for (tmp = use_protocols; tmp != NULL; tmp = tmp->next) - g_string_sprintfa(str, "use Irssi::%s;", (char *) tmp->data); + g_string_append_printf(str, "use Irssi::%s;", (char *) tmp->data); ret = str->str; g_string_free(str, FALSE); |