Changeset 6b13103 for nick.c

Timestamp:

2015-01-16T19:50:23Z (8 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

File:

• nick.c (modified) (4 diffs)

nick.c

@@ -41 +41 @@
         do {
                 if (*orig != ' ')
-                        new[i++] = tolower( *orig );
+                        new[i++] = g_ascii_tolower( *orig );
         }
         while (*(orig++));
@@ -144 +144 @@
                                 fmt += 2;
                         }
-                        else if( isdigit( *fmt ) )
+                        else if( g_ascii_isdigit( *fmt ) )
                         {
                                 len = 0;
                                 /* Grab a number. */
-                                while( isdigit( *fmt ) )
+                                while( g_ascii_isdigit( *fmt ) )
                                         len = len * 10 + ( *(fmt++) - '0' );
                         }
@@ -331 +331 @@
                 }
         }
-        if( isdigit( nick[0] ) )
+        if( g_ascii_isdigit( nick[0] ) )
         {
                 char *orig;
@@ -351 +351 @@
         
         /* Empty/long nicks are not allowed, nor numbers at [0] */
-        if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
+        if( !*nick || g_ascii_isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
                 return 0;