Changeset 1065dd4 for protocols/jabber

Timestamp:

2015-01-17T20:00:49Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

eb4ad8d

Parents:

bc7a0d4 (diff), 6b13103 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge cleanup changes. (FSF address fix, and using GLib variants of some
functions which cleans up compiler warnings.)

Location:

protocols/jabber

Files:

• jabber_util.c (modified) (2 diffs)
• sasl.c (modified) (2 diffs)

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 ++;