* define StrBufNOTNULL, we use it for the Next-Tokenizer to signal that we reached...

[citadel.git] / libcitadel / lib / stringbuf.c

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 5d6d4125b0922250c64214b4c2393791b03ae80c..a7beafe5cced7d0c8311d2b919d67e9880d9ea07 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -27,6 +27,8 @@ int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen,
 #endif
 int BaseStrBufSize = 64;
 
+const char *StrBufNOTNULL = ((char*) NULL) - 1;
+
 /**
  * Private Structure for the Stringbuffer
  */
@@ -1314,10 +1316,8 @@ unsigned long StrBufExtract_unsigned_long(const StrBuf* Source, int parmnum, cha
  */
 int StrBufHaveNextToken(const StrBuf *Source, const char **pStart)
 {
-       const char *Null = NULL;
-       Null --;
        if ((Source == NULL) || 
-           (*pStart == Null) ||
+           (*pStart == StrBufNOTNULL) ||
            (Source->BufUsed == 0))
        {
                return 0;
@@ -1356,8 +1356,7 @@ int StrBufExtract_NextToken(StrBuf *dest, const StrBuf *Source, const char **pSt
        if ((Source          == NULL) || 
            (Source->BufUsed == 0)      ) 
        {
-               *pStart = NULL;
-               (*pStart) --; /* move it to the end of all being via underflow */
+               *pStart = StrBufNOTNULL;
                return -1;
        }
         
@@ -1421,8 +1420,7 @@ int StrBufExtract_NextToken(StrBuf *dest, const StrBuf *Source, const char **pSt
 
        /* did we reach the end? */
        if ((s > EndBuffer)) {
-               EndBuffer = NULL;
-               EndBuffer --;
+               EndBuffer = StrBufNOTNULL;
                *pStart = EndBuffer;
        }
        else {