Changeset 6b13103 for protocols

Timestamp:

2015-01-16T19:50:23Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1065dd4, eabe6d4

Parents:

6f10697

Message:

Replace isdigit/isalpha/.../tolower/toupper with glib variants

This fixes warnings about passing signed chars to them (apparently they
are implemented as macros that do array lookups without checks in some
platforms, yay)

Specifically:

functions=isalnum|isalpha|isdigit|isspace|isxdigit|tolower|toupper
sed -ir "s/$functions/g_ascii_&/g" /*.c

Location:

protocols

Files:

• account.c (modified) (4 diffs)
• jabber/jabber_util.c (modified) (2 diffs)
• jabber/sasl.c (modified) (2 diffs)
• msn/msn.c (modified) (1 diff)
• msn/ns.c (modified) (2 diffs)
• msn/sb.c (modified) (2 diffs)
• oscar/auth.c (modified) (1 diff)
• oscar/oscar.c (modified) (3 diffs)
• oscar/oscar_util.c (modified) (1 diff)
• purple/purple.c (modified) (2 diffs)
• skype/skype.c (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)
• yahoo/yahoo_httplib.c (modified) (1 diff)

protocols/account.c

@@ -81 +81 @@
         if( strcmp( prpl->name, "oscar" ) == 0 )
         {
-                if( isdigit( a->user[0] ) )
+                if( g_ascii_isdigit( a->user[0] ) )
                         strcpy( tag, "icq" );
                 else
@@ -417 +417 @@
         
         /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */
-        while( *value && isdigit( *value ) )
+        while( *value && g_ascii_isdigit( *value ) )
                 p->start = p->start * 10 + *value++ - '0';
         
@@ -433 +433 @@
         
         /* + or * the delay by this number every time. */
-        while( *value && isdigit( *value ) )
+        while( *value && g_ascii_isdigit( *value ) )
                 p->step = p->step * 10 + *value++ - '0';
         
@@ -444 +444 @@
         p->max = 0;
         value ++;
-        while( *value && isdigit( *value ) )
+        while( *value && g_ascii_isdigit( *value ) )
                 p->max = p->max * 10 + *value++ - '0';
         

protocols/jabber/jabber_util.c

@@ -321 +321 @@
                         return FALSE;
                 }
-                if( tolower( jid1[i] ) != tolower( jid2[i] ) )
+                if( g_ascii_tolower( jid1[i] ) != g_ascii_tolower( jid2[i] ) )
                 {
                         return FALSE;
@@ -342 +342 @@
            it's Unicode but feck Unicode. :-P So stop once we see a slash. */
         for( i = 0; i < len && orig[i] != '/' ; i ++ )
-                new[i] = tolower( orig[i] );
+                new[i] = g_ascii_tolower( orig[i] );
         for( ; orig[i]; i ++ )
                 new[i] = orig[i];

protocols/jabber/sasl.c

@@ -187 +187 @@
         len = strlen( field );
         
-        while( isspace( *data ) || *data == ',' )
+        while( g_ascii_isspace( *data ) || *data == ',' )
                 data ++;
         
@@ -210 +210 @@
                         if( data[i] == ',' )
                         {
-                                while( isspace( data[i] ) || data[i] == ',' )
+                                while( g_ascii_isspace( data[i] ) || data[i] == ',' )
                                         i ++;
                                 

protocols/msn/msn.c

@@ -377 +377 @@
         g_tree_insert( md->domaintree, bu->handle, bu );
         
-        for( handle = bu->handle; isdigit( *handle ); handle ++ );
+        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ );
         if( *handle == ':' )
         {

protocols/msn/ns.c

@@ -581 +581 @@
                 ic->flags |= OPT_PONGED;
         }
-        else if( isdigit( cmd[0][0] ) )
+        else if( g_ascii_isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );
@@ -997 +997 @@
         /* This might be a federated contact. Get its network number,
            prefixed to bu->handle with a colon. Default is 1. */
-        for( handle = bu->handle; isdigit( *handle ); handle ++ )
+        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ )
                 type = type * 10 + *handle - '0';
         if( *handle == ':' )

protocols/msn/sb.c

@@ -506 +506 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
+                if( num_parts < 4 || !g_ascii_isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -645 +645 @@
                 }
         }
-        else if( isdigit( cmd[0][0] ) )
+        else if( g_ascii_isdigit( cmd[0][0] ) )
         {
                 int num = atoi( cmd[0] );

protocols/oscar/auth.c

@@ -125 +125 @@
                 return -EINVAL;
 
-        if (isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
+        if (g_ascii_isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
                 return goddamnicq(sess, conn, sn);
 

protocols/oscar/oscar.c

@@ -368 +368 @@
 {
         set_t *s;
-        gboolean icq = isdigit(acc->user[0]);
+        gboolean icq = g_ascii_isdigit(acc->user[0]);
         
         if (icq) {
@@ -394 +394 @@
         struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
-        if (isdigit(acc->user[0]))
+        if (g_ascii_isdigit(acc->user[0]))
                 odata->icq = TRUE;
         else
@@ -2500 +2500 @@
         char * chatname, *s;
         
-        chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
+        chatname = g_strdup_printf("%s%s%d", g_ascii_isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
         
         for (s = chatname; *s; s ++)
-                if (!isalnum(*s))
+                if (!g_ascii_isalnum(*s))
                         *s = '0';
         

protocols/oscar/oscar_util.c

@@ -57 +57 @@
                                 curPtr2++;
                 } else {
-                        if ( toupper(*curPtr1) != toupper(*curPtr2))
+                        if ( g_ascii_toupper(*curPtr1) != g_ascii_toupper(*curPtr2))
                                 return 1;
                         curPtr1++;

protocols/purple/purple.c

@@ -61 +61 @@
                 while( *a == '_' ) a ++;
                 while( *b == '_' ) b ++;
-                if( tolower( *a ) != tolower( *b ) )
+                if( g_ascii_tolower( *a ) != g_ascii_tolower( *b ) )
                         return FALSE;
                 
@@ -1148 +1148 @@
                                 {
                                         n = strlen( value ) - 1;
-                                        while( isspace( value[n] ) )
+                                        while( g_ascii_isspace( value[n] ) )
                                                 n --;
                                         g_string_append_len( info, value, n + 1 );

protocols/skype/skype.c

@@ -514 +514 @@
                                 char *iptr = sd->info_sex;
                                 while (*iptr++)
-                                        *iptr = tolower(*iptr);
+                                        *iptr = g_ascii_tolower(*iptr);
                                 g_string_append_printf(st,
                                         "Gender: %s\n", sd->info_sex);

protocols/twitter/twitter.c

@@ -459 +459 @@
 
                         strcpy(pin, message);
-                        for (s = pin + sizeof(pin) - 2; s > pin && isspace(*s); s--)
+                        for (s = pin + sizeof(pin) - 2; s > pin && g_ascii_isspace(*s); s--)
                                 *s = '\0';
-                        for (s = pin; *s && isspace(*s); s++) {
+                        for (s = pin; *s && g_ascii_isspace(*s); s++) {
                         }
 

protocols/yahoo/yahoo_httplib.c

@@ -152 +152 @@
 static int isurlchar(unsigned char c)
 {
-        return (isalnum(c));
+        return (g_ascii_isalnum(c));
 }