Changeset 6b13103 for lib

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:

lib

Files:

• http_client.c (modified) (1 diff)
• ini.c (modified) (1 diff)
• json.c (modified) (4 diffs)
• misc.c (modified) (4 diffs)
• ssl_gnutls.c (modified) (1 diff)
• ssl_openssl.c (modified) (1 diff)

lib/http_client.c

@@ -345 +345 @@
                 /* Might be a \r\n from the last chunk. */
                 s = chunk;
-                while( isspace( *s ) )
+                while( g_ascii_isspace( *s ) )
                         s ++;
                 /* Chunk length. Might be incomplete. */
                 if( s < eos && sscanf( s, "%x", &clen ) != 1 )
                         return CR_ERROR;
-                while( isxdigit( *s ) )
+                while( g_ascii_isxdigit( *s ) )
                         s ++;
                 

lib/ini.c

@@ -63 +63 @@
         char *e;
 
-        while( isspace( *in ) )
+        while( g_ascii_isspace( *in ) )
                 in++;
 
         e = in + strlen( in ) - 1;
-        while( e > in && isspace( *e ) )
+        while( e > in && g_ascii_isspace( *e ) )
                 e--;
         e[1] = 0;

lib/json.c

@@ -53 +53 @@
 static unsigned char hex_value (json_char c)
 {
-   if (isdigit(c))
+   if (g_ascii_isdigit(c))
       return c - '0';
 
@@ -609 +609 @@
                      default:
 
-                        if (isdigit (b) || b == '-')
+                        if (g_ascii_isdigit (b) || b == '-')
                         {
                            if (!new_value (&state, &top, &root, &alloc, json_integer))
@@ -616 +616 @@
                            if (!state.first_pass)
                            {
-                              while (isdigit (b) || b == '+' || b == '-'
+                              while (g_ascii_isdigit (b) || b == '+' || b == '-'
                                         || b == 'e' || b == 'E' || b == '.')
                               {
@@ -706 +706 @@
             case json_double:
 
-               if (isdigit (b))
+               if (g_ascii_isdigit (b))
                {
                   ++ num_digits;

lib/misc.c

@@ -163 +163 @@
         while( *in )
         {
-                if( *in == '<' && ( isalpha( *(in+1) ) || *(in+1) == '/' ) )
+                if( *in == '<' && ( g_ascii_isalpha( *(in+1) ) || *(in+1) == '/' ) )
                 {
                         /* If in points at a < and in+1 points at a letter or a slash, this is probably
@@ -198 +198 @@
                 {
                         cs = ++in;
-                        while( *in && isalpha( *in ) )
+                        while( *in && g_ascii_isalpha( *in ) )
                                 in ++;
                         
@@ -314 +314 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* Warning: isalnum() is locale-aware, so don't use it here! */
+                /* Warning: g_ascii_isalnum() is locale-aware, so don't use it here! */
                 if( ( t[i] >= 'A' && t[i] <= 'Z' ) ||
                     ( t[i] >= 'a' && t[i] <= 'z' ) ||
@@ -490 +490 @@
         
         while( *value )
-                if( !isdigit( *value ) )
+                if( !g_ascii_isdigit( *value ) )
                         return 0;
                 else

lib/ssl_gnutls.c

@@ -318 +318 @@
         gnutls_set_default_priority( conn->session );
         gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, xcred );
-        if( conn->hostname && !isdigit( conn->hostname[0] ) )
+        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
                 gnutls_server_name_set( conn->session, GNUTLS_NAME_DNS,
                                         conn->hostname, strlen( conn->hostname ) );

lib/ssl_openssl.c

@@ -159 +159 @@
         SSL_set_fd( conn->ssl, conn->fd );
         
-        if( conn->hostname && !isdigit( conn->hostname[0] ) )
+        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
                 SSL_set_tlsext_host_name( conn->ssl, conn->hostname );