Changeset 10073 for trunk/Ohana/src/libohana

Timestamp:

Nov 17, 2006, 5:04:25 PM (20 years ago)

Author:

eugene

Message:

added additional chars to whitespace checks

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/config.c (modified) (2 diffs)
• src/string.c (modified) (2 diffs)

trunk/Ohana/src/libohana/include/ohana.h

@@ -93 +93 @@
 # endif /* FOPEN */
 
+/*
+  isspace is c99 : do we require c99 now? 
+  isspace()
+   checks  for white-space characters.  In the "C" and "POSIX" locales, these are: space, form-feed ('\f'), newline ('\n'),
+   carriage return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
+   horiz. tab: 0x09, vert. tab: 0x0b, newline: 0x0a, form-feed: 0x0c, return: 0x0d, space: 0x20, 
+*/
+# define OHANA_WHITESPACE(c)(((c) == 0x09) || ((c) == 0x0a) || ((c) == 0x0b) || ((c) == 0x0b) || ((c) == 0x0c) || ((c) == 0x0d) || ((c) == 0x20))
+
 /* socket / pipe communication buffer */
 typedef struct {

trunk/Ohana/src/libohana/src/config.c

@@ -1 +1 @@
 # include <ohana.h>
-# ifndef whitespace
-# define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-# endif
 
 # define D_NBYTES 4096
@@ -278 +275 @@
     }
     p2 = tmp + strlen (tfield);
-    if (whitespace (*p2)) {
+    if (OHANA_WHITESPACE (*p2)) {
       p = p2;
       i++;

trunk/Ohana/src/libohana/src/string.c

@@ -1 +1 @@
 # include <ohana.h>
 
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-/* Strip whitespace from the start and end of STRING. */
+/* Strip WHITESPACE from the start and end of STRING. */
 int stripwhite (char *string) {
 
@@ -12 +8 @@
   if (string == (char *) NULL) return (FALSE);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (i) memmove (string, string + i, strlen(string+i)+1);
-  for (i = strlen (string) - 1; (i > 0) && whitespace (string[i]); i--);
+  for (i = strlen (string) - 1; (i > 0) && OHANA_WHITESPACE (string[i]); i--);
   string[++i] = 0;
   return (i);