*** empty log message ***

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

diff --git a/src/Headers/cstring.h b/src/Headers/cstring.h
index b034896bea5f8ae2a9d82d6a63ba6e41ec1da818..f82502edb286ffd892b567bebb4b89bad04ae53e 100644 (file)
--- a/src/Headers/cstring.h
+++ b/src/Headers/cstring.h
@@ -51,15 +51,15 @@ extern void cstring_replaceAll (cstring p_s, char p_old, char p_snew) /*@modifie
 # endif
 
 extern void cstring_replaceLit (/*@unique@*/ cstring p_s, char *p_old, char *p_snew);
-extern char cstring_firstChar (cstring p_s);
-extern char cstring_secondChar (cstring p_s);
+extern char cstring_firstChar (cstring p_s) /*@*/ ;
+extern char cstring_secondChar (cstring p_s) /*@*/ ;
 extern char cstring_lastChar (cstring p_s) /*@*/ ;
 extern char cstring_getChar (cstring p_s, int p_n);
 extern void cstring_setChar (cstring p_s, int p_n, char p_c);
 
 # define cstring_secondChar(s) cstring_getChar (s, 2)
 
-extern /*@exposed@*/ /*@notnull@*/ char *
+extern /*@exposed@*/ /*@notnull@*/ /*@untainted@*/ char *
   cstring_toCharsSafe (/*@temp@*/ /*@exposed@*/ /*@returned@*/ cstring p_s)
      /*@*/ ;
 
@@ -99,21 +99,26 @@ extern bool cstring_lessthan (cstring p_s1, cstring p_s2) /*@*/ ;
 extern bool cstring_equalFree (/*@only@*/ cstring p_c1, /*@only@*/ cstring p_c2);
 
 /* really exposed! */
-extern cstring 
+
+/*
+** Don't allow tainted cstring's
+*/
+
+extern /*@untained@*/ cstring 
   cstring_fromChars (/*@returned@*/ /*@null@*/ 
-                    const /*@exposed@*/ /*@temp@*/ char *p_cp) /*@*/ ;
+                    const /*:untainted@*/ /*@exposed@*/ /*@temp@*/ char *p_cp) /*@*/ ;
 
 extern cstring
-  cstring_fromCharsO (/*@null@*/ /*@only@*/ char *p_cp) /*@*/ ;
+   cstring_fromCharsO (/*@null@*/ /*:untainted@*/ /*@only@*/ char *p_cp) /*@*/ ;
 /*@-mustfree@*/
 # define cstring_fromCharsO(s) cstring_fromChars(s)
 /*@=mustfree@*/
 
-extern cstring cstring_fromCharsNew (/*@null@*/ char *p_s) /*@*/ ;
+extern cstring cstring_fromCharsNew (/*:untainted@*/ /*@null@*/ char *p_s) /*@*/ ;
 # define cstring_fromCharsNew(s) cstring_copy(cstring_fromChars(s))
 
 # ifndef NOLCL
-extern /*@exposed@*/ /*@notnull@*/ 
+extern /*@exposed@*/ /*@notnull@*/ /*@untainted@*/
   char *cstring_toCharsSafeO (/*@only@*/ /*@exposed@*/ /*@returned@*/ cstring p_s);
 /*@-mustfree@*/
 # define cstring_toCharsSafeO(s) cstring_toCharsSafe(s)