Changeset 1065dd4 for nick.c

Timestamp:

2015-01-17T20:00:49Z (9 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.)

File:

• nick.c (modified) (5 diffs)

nick.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -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;