Update utility/ again. Don't use isdigit() or isspsace().

wolongac · Dec 1, 2020 · 095ed09 · 095ed09
1 parent aa43bb5
commit 095ed09
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/stores/objectStore.C b/src/stores/objectStore.C
@@ -52,10 +52,10 @@ findSeqStorePath(char *requested) {
       (filename[3] != 'b') ||
       (filename[4] != 's') ||
       (filename[5] != '.') ||
-      (isdigit(filename[6]) == 0) ||
-      (isdigit(filename[7]) == 0) ||
-      (isdigit(filename[8]) == 0) ||
-      (isdigit(filename[9]) == 0))
+      (isDecDigit(filename[6]) == false) ||
+      (isDecDigit(filename[7]) == false) ||
+      (isDecDigit(filename[8]) == false) ||
+      (isDecDigit(filename[9]) == false))
     return(NULL);
 
   //  Now just paste the two components together in the proper
@@ -86,14 +86,14 @@ findOvlStorePath(char *requested) {
   //  This format is defined in ovFile::createDataName() in ovStoreFile.C
 
   if ((strlen(filename) != 8) ||
-      (isdigit(filename[0]) == 0) ||
-      (isdigit(filename[1]) == 0) ||
-      (isdigit(filename[2]) == 0) ||
-      (isdigit(filename[3]) == 0) ||
+      (isDecDigit(filename[0]) == false) ||
+      (isDecDigit(filename[1]) == false) ||
+      (isDecDigit(filename[2]) == false) ||
+      (isDecDigit(filename[3]) == false) ||
       (filename[4] != '-')        ||
-      (isdigit(filename[5]) == 0) ||
-      (isdigit(filename[6]) == 0) ||
-      (isdigit(filename[7]) == 0))
+      (isDecDigit(filename[5]) == false) ||
+      (isDecDigit(filename[6]) == false) ||
+      (isDecDigit(filename[7]) == false))
     return(NULL);
 
   //  Get ready for some ugly string parsing.  We expect strings similar to:

diff --git a/src/stores/sqLibrary.H b/src/stores/sqLibrary.H
@@ -67,7 +67,7 @@ public:
         if        (*orig == '/') {
           _libraryName[lp++] = '_';
 
-        } else if (isspace(*orig) == 0) {
+        } else if (isWhiteSpace(*orig) == false) {
           _libraryName[lp++] = *orig;
 
         } else {

diff --git a/src/utility b/src/utility
+2 −1		src/tests/parasailTest.C
+1 −1		src/utility/bits-wordArray.C
+2 −2		src/utility/files.C
+0 −7		src/utility/sequence.C
+29 −9		src/utility/strings.C
+6 −45		src/utility/strings.H
+2 −2		src/utility/types.C
+37 −0		src/utility/types.H