Make our VG_(isspace)() match libc's isspace(). And remove ISSPACE and
VG_ISSPACE, replacing them with calls to VG_(isspace)().
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3439 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 31c465b..0ce4132 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -489,8 +489,6 @@
# undef FLEN
}
-#define ISSPACE(cc) ((cc) == ' ' || (cc) == '\t' || (cc) == '\n')
-
static Int count_args(char* s)
{
Int n = 0;
@@ -499,10 +497,10 @@
while (True) {
// We have alternating sequences: blanks, non-blanks, blanks...
// count the non-blanks sequences.
- while ( ISSPACE(*cp) ) cp++;
+ while ( VG_(isspace)(*cp) ) cp++;
if ( !*cp ) break;
n++;
- while ( !ISSPACE(*cp) && *cp ) cp++;
+ while ( !VG_(isspace)(*cp) && *cp ) cp++;
}
}
return n;
@@ -516,10 +514,10 @@
while (True) {
// We have alternating sequences: blanks, non-blanks, blanks...
// copy the non-blanks sequences, and add terminating '\0'
- while ( ISSPACE(*cp) ) cp++;
+ while ( VG_(isspace)(*cp) ) cp++;
if ( !*cp ) break;
*to++ = cp;
- while ( !ISSPACE(*cp) && *cp ) cp++;
+ while ( !VG_(isspace)(*cp) && *cp ) cp++;
if ( *cp ) *cp++ = '\0'; // terminate if necessary
if (VG_STREQ(to[-1], "--")) to--; // undo any '--' arg
}
@@ -527,8 +525,6 @@
return to;
}
-#undef ISSPACE
-
// Augment command line with arguments from environment and .valgrindrc
// files.
static void augment_command_line(Int* vg_argc_inout, char*** vg_argv_inout)