* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 5cb896c6f16da59bf3b87904e55f75324a94959b..4a5ee52c7a9d66d7bfc55e4cf97dbb80c80b16c0 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -1,6 +1,8 @@
 /*
- * tools.c -- Miscellaneous routines used by both the client and server.
  * $Id$
+ *
+ * Utility functions that are used by both the client and server.
+ *
  */
 
 #include "sysdep.h"
@@ -10,6 +12,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include "tools.h"
+#include "citadel.h"
 
 #define TRUE  1
 #define FALSE 0
@@ -141,7 +144,7 @@ void remove_token(char *source, int parmnum, char separator)
  */
 int extract_int(char *source, int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atoi(buf));
@@ -152,7 +155,7 @@ int extract_int(char *source, int parmnum)
  */
 long extract_long(char *source, long int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atol(buf));
@@ -289,9 +292,9 @@ void decode_base64(char *dest, char *source)
  */
 void striplt(char *buf)
 {
-        while ((strlen(buf) > 0) && (buf[0] == 32))
+        while ((strlen(buf) > 0) && (isspace(buf[0])))
                 strcpy(buf, &buf[1]);
-        while (buf[strlen(buf) - 1] == 32)
+        while (isspace(buf[strlen(buf) - 1]))
                 buf[strlen(buf) - 1] = 0;
 }