[Qemu-devel] [5774] Use qemu_isfoobar and qemu_towombat versions, based on patch by Christoph Egger

[Blue Swirl <blauwirbel@gmail.com>]

Revision: 5774
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5774
Author:   blueswir1
Date:     2008-11-22 20:04:24 +0000 (Sat, 22 Nov 2008)

Log Message:
-----------
Use qemu_isfoobar and qemu_towombat versions, based on patch by Christoph Egger

Modified Paths:
--------------
    trunk/block-vvfat.c
    trunk/nbd.c
    trunk/net.c
    trunk/qemu-sockets.c
    trunk/usb-linux.c

Modified: trunk/block-vvfat.c
===================================================================
--- trunk/block-vvfat.c	2008-11-22 10:09:27 UTC (rev 5773)
+++ trunk/block-vvfat.c	2008-11-22 20:04:24 UTC (rev 5774)
@@ -1485,7 +1485,7 @@
 	if (direntry->name[i] <= ' ' || direntry->name[i] > 0x7f)
 	    return -1;
 	else if (s->downcase_short_names)
-	    lfn->name[i] = tolower(direntry->name[i]);
+	    lfn->name[i] = qemu_tolower(direntry->name[i]);
 	else
 	    lfn->name[i] = direntry->name[i];
     }
@@ -1498,7 +1498,7 @@
 	    if (direntry->extension[j] <= ' ' || direntry->extension[j] > 0x7f)
 		return -2;
 	    else if (s->downcase_short_names)
-		lfn->name[i + j] = tolower(direntry->extension[j]);
+		lfn->name[i + j] = qemu_tolower(direntry->extension[j]);
 	    else
 		lfn->name[i + j] = direntry->extension[j];
 	}

Modified: trunk/nbd.c
===================================================================
--- trunk/nbd.c	2008-11-22 10:09:27 UTC (rev 5773)
+++ trunk/nbd.c	2008-11-22 20:04:24 UTC (rev 5774)
@@ -314,14 +314,14 @@
 	*blocksize = 1024;
 
 	TRACE("Magic is %c%c%c%c%c%c%c%c",
-	      isprint(buf[0]) ? buf[0] : '.',
-	      isprint(buf[1]) ? buf[1] : '.',
-	      isprint(buf[2]) ? buf[2] : '.',
-	      isprint(buf[3]) ? buf[3] : '.',
-	      isprint(buf[4]) ? buf[4] : '.',
-	      isprint(buf[5]) ? buf[5] : '.',
-	      isprint(buf[6]) ? buf[6] : '.',
-	      isprint(buf[7]) ? buf[7] : '.');
+	      qemu_isprint(buf[0]) ? buf[0] : '.',
+	      qemu_isprint(buf[1]) ? buf[1] : '.',
+	      qemu_isprint(buf[2]) ? buf[2] : '.',
+	      qemu_isprint(buf[3]) ? buf[3] : '.',
+	      qemu_isprint(buf[4]) ? buf[4] : '.',
+	      qemu_isprint(buf[5]) ? buf[5] : '.',
+	      qemu_isprint(buf[6]) ? buf[6] : '.',
+	      qemu_isprint(buf[7]) ? buf[7] : '.');
 	TRACE("Magic is 0x%" PRIx64, magic);
 	TRACE("Size is %" PRIu64, *size);
 

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2008-11-22 10:09:27 UTC (rev 5773)
+++ trunk/net.c	2008-11-22 20:04:24 UTC (rev 5774)
@@ -668,7 +668,7 @@
 
     if( *dev ){
        ptr = dev;
-       while( *ptr && !isdigit((int)*ptr) ) ptr++;
+       while( *ptr && !qemu_isdigit((int)*ptr) ) ptr++;
        ppa = atoi(ptr);
     }
 

Modified: trunk/qemu-sockets.c
===================================================================
--- trunk/qemu-sockets.c	2008-11-22 10:09:27 UTC (rev 5773)
+++ trunk/qemu-sockets.c	2008-11-22 20:04:24 UTC (rev 5774)
@@ -20,6 +20,7 @@
 #include <unistd.h>
 
 #include "qemu_socket.h"
+#include "qemu-common.h" /* for qemu_isdigit */
 
 #ifndef AI_ADDRCONFIG
 # define AI_ADDRCONFIG 0
@@ -120,7 +121,7 @@
             return -1;
         }
         ai.ai_family = PF_INET6;
-    } else if (isdigit(str[0])) {
+    } else if (qemu_isdigit(str[0])) {
         /* IPv4 addr */
         if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) {
             fprintf(stderr, "%s: ipv4 parse error (%s)\n",
@@ -244,7 +245,7 @@
             return -1;
         }
         ai.ai_family = PF_INET6;
-    } else if (isdigit(str[0])) {
+    } else if (qemu_isdigit(str[0])) {
         /* IPv4 addr */
         if (2 != sscanf(str,"%64[0-9.]:%32[^,]",addr,port)) {
             fprintf(stderr, "%s: ipv4 parse error (%s)\n",

Modified: trunk/usb-linux.c
===================================================================
--- trunk/usb-linux.c	2008-11-22 10:09:27 UTC (rev 5773)
+++ trunk/usb-linux.c	2008-11-22 20:04:24 UTC (rev 5774)
@@ -1048,7 +1048,7 @@
     if (!p)
         return -1;
     p += strlen(tag);
-    while (isspace(*p))
+    while (qemu_isspace(*p))
         p++;
     q = buf;
     while (*p != '\0' && !strchr(stopchars, *p)) {