Fixed problem with NULL being changed.

[splint.git] / src / Headers / cstring.h

diff --git a/src/Headers/cstring.h b/src/Headers/cstring.h
index d6d886bb1fcfeaab18e30174db75e7d4f32697bc..e3250100734eaec307d6e6bb908ac96dfa165979 100644 (file)
--- a/src/Headers/cstring.h
+++ b/src/Headers/cstring.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -67,8 +67,8 @@ extern void cstring_setChar (cstring p_s, size_t p_n, char p_c)
 # define cstring_secondChar(s) cstring_getChar (s, 2)
 
 extern /*@exposed@*/ /*@notnull@*/ /*@untainted@*/ char *
-  cstring_toCharsSafe (/*@temp@*/ /*@exposed@*/ /*@returned@*/ cstring p_s)
-     /*@*/ ;
+cstring_toCharsSafe (/*@temp@*/ /*@exposed@*/ /*@returned@*/ cstring p_s)
+   /*@*/ ;
 
 extern size_t cstring_length (cstring p_s) /*@*/ /*@ensures result == maxRead(p_s) @*/;
 
@@ -84,9 +84,7 @@ extern bool cstring_equalLit (cstring p_c1, char *p_c2) /*@*/ ;
 extern int cstring_compare (cstring p_c1, cstring p_c2) /*@*/ ;
 extern int cstring_xcompare (cstring *p_c1, cstring *p_c2) /*@*/ ;
 
-# ifndef NOLCL
 extern bool cstring_hasNonAlphaNumBar (cstring p_s) /*@*/ ;
-# endif
 
 extern cstring cstring_elide (cstring p_s, size_t p_len) /*@*/ ;
 
@@ -114,26 +112,24 @@ extern bool cstring_equalFree (/*@only@*/ cstring p_c1, /*@only@*/ cstring p_c2)
 ** Don't allow tainted cstring's
 */
 
-extern /*@untained@*/ cstring 
-  cstring_fromChars (/*@returned@*/ /*@null@*/ 
-                    const /*:untainted@*/ /*@exposed@*/ /*@temp@*/ char *p_cp) /*@*/ ;
+extern cstring 
+cstring_fromChars (/*@returned@*/ /*@null@*/ 
+                  const /*@exposed@*/ /*@temp@*/ char *p_cp) /*@*/ ;
 
 extern cstring
-   cstring_fromCharsO (/*@null@*/ /*:untainted@*/ /*@only@*/ char *p_cp) /*@*/ ;
+cstring_fromCharsO (/*@null@*/ /*@only@*/ char *p_cp) /*@*/ ;
 /*@-mustfree@*/
 # define cstring_fromCharsO(s) cstring_fromChars(s)
 /*@=mustfree@*/
 
-extern cstring cstring_fromCharsNew (/*:untainted@*/ /*@null@*/ char *p_s) /*@*/ ;
+extern cstring cstring_fromCharsNew (/*@null@*/ char *p_s) /*@*/ ;
 # define cstring_fromCharsNew(s) cstring_copy(cstring_fromChars(s))
 
-# ifndef NOLCL
 extern /*@exposed@*/ /*@notnull@*/ /*@untainted@*/
   char *cstring_toCharsSafeO (/*@only@*/ /*@exposed@*/ /*@returned@*/ cstring p_s);
 /*@-mustfree@*/
 # define cstring_toCharsSafeO(s) cstring_toCharsSafe(s)
 /*@=mustfree@*/
-# endif
 
 extern void cstring_free (/*@only@*/ cstring p_s);
 
@@ -180,13 +176,11 @@ extern cstring
   cstring_concatFree1 (/*@only@*/ cstring p_s, cstring p_t) 
   /*@modifies p_s@*/ ;
 
-# ifndef NOLCL
 extern cstring 
   cstring_concatChars (/*@only@*/ cstring p_s, char *p_t)
   /*@modifies p_s@*/ ;
 
 extern lsymbol cstring_toSymbol (/*@only@*/ cstring p_s) /*@*/ ;
-# endif
 
 extern void cstring_markOwned (/*@owned@*/ cstring p_s) /*@modifies p_s@*/ ;
 
@@ -213,7 +207,7 @@ extern /*@notnull@*/ cstring  cstring_expandEscapes (cstring p_s);
 /*drl added 01/23/2001  Gives you the number of characters in an
   expanded escape squences.  This can be different from strlen bc/ of
   escaped nulls.  */
-int  cstring_lengthExpandEscapes (cstring p_s);
+extern size_t cstring_lengthExpandEscapes (cstring p_s);
 
 
 extern bool cstring_containsLit (/*@unique@*/ cstring p_c, char *p_sub) /*@*/ ;