pidgin: 8daee71d: Backport the 'purple_debug_*(msg)' -> 'p...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 8daee71db7028dda036c11e23ca5a60fe834fa95
Ancestor: f3891f3348abfe90fbe60a054833c12075aa8df4
Author: rlaager at pidgin.im
Date: 2008-11-16T06:50:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8daee71db7028dda036c11e23ca5a60fe834fa95

Modified files:
        finch/gntdebug.c libpurple/plugins/tcl/tcl_cmd.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/utils.c libpurple/proxy.c

ChangeLog: 

Backport the 'purple_debug_*(msg)' -> 'purple_debug_*("%s", msg);' fixes.

applied changes from fef93b50fe2b6c172be07648cbc70b62a42fcfff
             through 111d22afa901c48464e4da4d37d1cca3381ae162

-------------- next part --------------
============================================================
--- finch/gntdebug.c	3ca1f6885f222d6a4fde9ceeca668031a43a7141
+++ finch/gntdebug.c	1f55b955ff4fe333c1d14ba5435b82856dc70aaf
@@ -233,7 +233,7 @@ file_save(GntFileSel *fs, const char *pa
 	}
 
 	fprintf(fp, "Finch Debug Log : %s\n", purple_date_format_full(NULL));
-	fprintf(fp, tv->string->str);
+	fprintf(fp, "%s", tv->string->str);
 	fclose(fp);
 	gnt_widget_destroy(GNT_WIDGET(fs));
 }
============================================================
--- libpurple/plugins/tcl/tcl_cmd.c	9fac56dcb8304e1b48561bdc9ab427fdc4703581
+++ libpurple/plugins/tcl/tcl_cmd.c	8a109a5402e98753148b56148cec51ec26948e73
@@ -159,7 +159,7 @@ static PurpleCmdRet tcl_cmd_callback(Pur
 
 		errorstr = g_strdup_printf("error evaluating callback: %s\n",
 		                           Tcl_GetString(Tcl_GetObjResult(handler->interp)));
-		purple_debug(PURPLE_DEBUG_ERROR, "tcl", errorstr);
+		purple_debug(PURPLE_DEBUG_ERROR, "tcl", "%s", errorstr);
 		*errors = errorstr;
 		retval = PURPLE_CMD_RET_FAILED;
 	} else {
@@ -170,7 +170,7 @@ static PurpleCmdRet tcl_cmd_callback(Pur
 
 			errorstr = g_strdup_printf("Error retreiving procedure result: %s\n",
 			                           Tcl_GetString(Tcl_GetObjResult(handler->interp)));
-			purple_debug(PURPLE_DEBUG_ERROR, "tcl", errorstr);
+			purple_debug(PURPLE_DEBUG_ERROR, "tcl", "%s", errorstr);
 			*errors = errorstr;
 			retval = PURPLE_CMD_RET_FAILED;
 		}
============================================================
--- libpurple/protocols/gg/gg.c	cd4a52d3d3db06a25c6cde90335e75f6e43fe085
+++ libpurple/protocols/gg/gg.c	8251a4c3cbd7c7f4b7e8648e05714b9a3662b0f0
@@ -2232,7 +2232,7 @@ static void purple_gg_debug_handler(int 
 			break;
 	}
 
-	purple_debug(purple_level, "gg", msg);
+	purple_debug(purple_level, "gg", "%s", msg);
 	g_free(msg);
 }
 /* }}} */
============================================================
--- libpurple/protocols/oscar/oscar.c	58400df53ec856ac2be0cf49540f2f76e5a6724f
+++ libpurple/protocols/oscar/oscar.c	12ac5215674a804204d59d2d238e660ee826f4f9
@@ -1676,7 +1676,7 @@ static void damn_you(gpointer data, gint
 	for (x = 0; x < 16; x++)
 		g_string_append_printf(msg, "%02hhx ", (unsigned char)m[x]);
 	g_string_append(msg, "\n");
-	purple_debug_misc("oscar", msg->str);
+	purple_debug_misc("oscar", "%s", msg->str);
 	g_string_free(msg, TRUE);
 
 	purple_input_remove(pos->inpa);
@@ -4947,7 +4947,7 @@ static int purple_ssi_parserights(OscarD
 	for (i=0; i<numtypes; i++)
 		g_string_append_printf(msg, " max type 0x%04x=%hd,", i, maxitems[i]);
 	g_string_append(msg, "\n");
-	purple_debug_misc("oscar", msg->str);
+	purple_debug_misc("oscar", "%s", msg->str);
 	g_string_free(msg, TRUE);
 
 	if (numtypes >= 0)
============================================================
--- libpurple/protocols/qq/utils.c	699c6634e7564909e6bbc5720fa782d223e38c0c
+++ libpurple/protocols/qq/utils.c	c2ec9b111bd7d70ec795fda6284b8788fa180fb6
@@ -325,7 +325,7 @@ void qq_hex_dump(PurpleDebugLevel level,
 	va_end(args);
 
 	if (bytes <= 0) {
-		purple_debug(level, category, arg_s);
+		purple_debug(level, category, "%s", arg_s);
 		return;
 	}
 
============================================================
--- libpurple/proxy.c	c319023ab74877039993e91ad873edb534716d2a
+++ libpurple/proxy.c	8f37a759f25088bde3743c53fd577037a46f2bff
@@ -1342,7 +1342,7 @@ s5_canread_again(gpointer data, gint sou
 
 	if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
 		if ((buf[0] == 0x05) && (buf[1] < 0x09)) {
-			purple_debug_error("socks5 proxy", socks5errors[buf[1]]);
+			purple_debug_error("socks5 proxy", "%s", socks5errors[buf[1]]);
 			purple_proxy_connect_data_disconnect(connect_data,
 					socks5errors[buf[1]]);
 		} else {