Changeset cd4723c

Timestamp:

2007-04-15T21:59:52Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c2fb3809

Parents:

552e641

Message:

More format string problems.

Location:

protocols

Files:

• jabber/iq.c (modified) (1 diff)
• oscar/oscar.c (modified) (9 diffs)
• yahoo/yahoo.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -536 +536 @@
         /* *sigh* */
         
-        imc_log( ic, reply->str );
+        imc_log( ic, "%s", reply->str );
         g_string_free( reply, TRUE );
         

protocols/oscar/oscar.c

@@ -1264 +1264 @@
         guint16 chan, nummissed, reason;
         aim_userinfo_t *userinfo;
-        char buf[1024];
 
         va_start(ap, fr);
@@ -1276 +1275 @@
                 case 0:
                         /* Invalid (0) */
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because it was invalid.") :
@@ -1286 +1284 @@
                 case 1:
                         /* Message too large */
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ?
                                    _("You missed %d message from %s because it was too large.") :
@@ -1296 +1293 @@
                 case 2:
                         /* Rate exceeded */
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because the rate limit has been exceeded.") :
@@ -1306 +1302 @@
                 case 3:
                         /* Evil Sender */
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ?
                                    _("You missed %d message from %s because it was too evil.") : 
@@ -1316 +1311 @@
                 case 4:
                         /* Evil Receiver */
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because you are too evil.") :
@@ -1325 +1319 @@
                         break;
                 default:
-                        g_snprintf(buf,
-                                   sizeof(buf),
+                        imc_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s for unknown reasons.") :
@@ -1334 +1327 @@
                         break;
         }
-        imc_error(sess->aux_data, buf);
 
         return 1;
@@ -1926 +1918 @@
 
         if (strlen(message) > od->rights.maxawaymsglen) {
-                gchar *errstr;
-
-                errstr = g_strdup_printf("Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
-
-                imc_error(ic, errstr);
-
-                g_free(errstr);
+                imc_error(ic, "Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
         }
 

protocols/yahoo/yahoo.c

@@ -518 +518 @@
         {
                 char *errstr;
-                char *s;
                 
                 yd->logged_in = FALSE;
@@ -539 +538 @@
                 
                 if( url && *url )
-                {
-                        s = g_malloc( strlen( "Error %d (%s). See %s for more information." ) + strlen( url ) + strlen( errstr ) + 16 );
-                        sprintf( s, "Error %d (%s). See %s for more information.", succ, errstr, url );
-                }
+                        imc_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
                 else
-                {
-                        s = g_malloc( strlen( "Error %d (%s)" ) + strlen( errstr ) + 16 );
-                        sprintf( s, "Error %d (%s)", succ, errstr );
-                }
-                
-                if( yd->logged_in )
-                        imc_error( ic, s );
-                else
-                        imc_error( ic, s );
-                
-                g_free( s );
+                        imc_error( ic, "Error %d (%s)", succ, errstr );
                 
                 imc_logout( ic );