Fixed branch state bug with definitely null values (reported by Jon Wilson).

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

diff --git a/src/Headers/general.h b/src/Headers/general.h
index 39cf84f841357d004accebf69167a080887792d4..99b07e76b389f5f221535c29384aba4a57178504 100644 (file)
--- a/src/Headers/general.h
+++ b/src/Headers/general.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2000.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
 ** See ../LICENSE for license information.
 **
 */
@@ -19,17 +19,15 @@
 # ifdef USEDMALLOC
 # define sfree(x) do { if (x != NULL) free(x); } while (FALSE)
 # else
-extern void sfree (/*@out@*/ /*@only@*/ /*@null@*/ void *p_x) /*@modifies *p_x@*/; 
+extern void sfree (/*@out@*/ /*@only@*/ /*@null@*/ void *p_x) /*@modifies p_x@*/; 
 # endif
 
 # include "misc.h"
 # include "cstring.h"
 # include "bool.h"
 
-# define getStringWord(s)     (cstring_fromChars(getWord(s)))
-
-extern /*@out@*/ /*@only@*/ void *dimalloc  (size_t p_size, char *p_name, int p_line);
-extern /*@only@*/ void *dicalloc  (size_t p_num, size_t p_size, char *p_name, int p_line);
+extern /*@out@*/ /*@only@*/ void *dimalloc  (size_t p_size, const char *p_name, int p_line);
+extern /*@only@*/ void *dicalloc  (size_t p_num, size_t p_size, const char *p_name, int p_line);
 extern /*@notnull@*/ /*@out@*/ /*@only@*/ void *
   direalloc (/*@returned@*/ /*@only@*/ /*@out@*/ /*@null@*/ void *p_x, 
             size_t p_size, char *p_name, int p_line);
@@ -40,7 +38,8 @@ extern /*@only@*/ void *
   /*@releases p_x@*/
   /*@modifies *p_x@*/ ;
 
-extern /*@out@*/ /*@only@*/ void *dmalloc  (/*@sef@*/ size_t p_size) /*@*/ ;
+extern /*@out@*/ /*@only@*/ void *dmalloc (/*@sef@*/ size_t p_size) /*@*/
+   /*@ensures MaxSet(result) == (p_size - 1); @*/ ;
 
 # ifdef USEDMALLOC
 # define dmalloc(s)    (malloc(s))