From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3yiS-0002vm-A4 for qemu-devel@nongnu.org; Sat, 22 Nov 2008 15:04:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3yiQ-0002vZ-SG for qemu-devel@nongnu.org; Sat, 22 Nov 2008 15:04:27 -0500 Received: from [199.232.76.173] (port=43097 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3yiQ-0002vW-MC for qemu-devel@nongnu.org; Sat, 22 Nov 2008 15:04:26 -0500 Received: from savannah.gnu.org ([199.232.41.3]:47263 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L3yiQ-0005Y5-Lf for qemu-devel@nongnu.org; Sat, 22 Nov 2008 15:04:26 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L3yiP-0002ni-Pf for qemu-devel@nongnu.org; Sat, 22 Nov 2008 20:04:25 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L3yiP-0002ne-ER for qemu-devel@nongnu.org; Sat, 22 Nov 2008 20:04:25 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sat, 22 Nov 2008 20:04:25 +0000 Subject: [Qemu-devel] [5774] Use qemu_isfoobar and qemu_towombat versions, based on patch by Christoph Egger Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 #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)) {