Code Cleanup:

Use g_string_append_printf() instead of g_string_sprintfa() (which is considered deprecated.)


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5003 dbcabf3a-b0e7-0310-adc4-f8d773084564

5 files changed, 26 insertions, 26 deletions

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);