Cleaned up flags to generate manual help.

[splint.git] / src / constraintList.c

diff --git a/src/constraintList.c b/src/constraintList.c
index 8949732008aecf020f54e8b9a94f04b394311e46..ac1a26f767b1d21ecc895b38b9213d9ced753057 100644 (file)
--- a/src/constraintList.c
+++ b/src/constraintList.c
@@ -1,5 +1,5 @@
 /*
-** LCLint - annotation-assisted static program checker
+** Splint - annotation-assisted static program checker
 ** Copyright (C) 1994-2000 University of Virginia,
 **         Massachusetts Institute of Technology
 **
@@ -19,8 +19,9 @@
 **
 ** For information on lclint: lclint-request@cs.virginia.edu
 ** To report a bug: lclint-bug@cs.virginia.edu
-** For more information: http://lclint.cs.virginia.edu
+** For more information: http://www.splint.org
 */
+
 /*
 ** constraintList.c
 **
@@ -172,20 +173,22 @@ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s)
     {
       loc = constraint_getFileloc(elem);
 
-      if(fileloc_isUndefined(loc) )
+      if (fileloc_isUndefined(loc))
        {
          ret = constraintList_add (ret, elem);
        }
       
-      else if (context_suppressFlagMsg(FLG_ARRAYBOUNDS, loc) )
+      else if (context_suppressFlagMsg(FLG_BOUNDSWRITE, loc) )
        {
-         DPRINTF(( message("constraintList_removeSurpressed getting rid of surpressed constraint %q", constraint_print(elem) ) ));
+         DPRINTF ((message ("constraintList_removeSurpressed getting rid of surpressed constraint %q", 
+                            constraint_print(elem))));
          constraint_free(elem);
        }
       
-      else if ( (! constraint_hasMaxSet(elem) ) && context_suppressFlagMsg(FLG_ARRAYBOUNDSREAD, loc) )
+      else if (!constraint_hasMaxSet(elem) && context_suppressFlagMsg(FLG_BOUNDSREAD, loc))
        {
-         DPRINTF(( message("constraintList_removeSurpressed getting rid of surpressed constraint %q", constraint_print(elem) ) ));
+         DPRINTF ((message("constraintList_removeSurpressed getting rid of surpressed constraint %q", 
+                           constraint_print(elem))));
          constraint_free(elem);
        }
       else
@@ -384,7 +387,7 @@ constraintList_logicalOr (/*@observer@*/ constraintList l1, /*@observer@*/ const
 {
   constraint temp;
   constraintList ret;
-  DPRINTF ( (message ("Logical or on %s and %s",
+  DPRINTF ((message ("Logical or on %s and %s",
                      constraintList_print(l1), 
                      constraintList_print(l2)) ) );
   
@@ -571,12 +574,12 @@ constraintList constraintList_togglePost (/*@returned@*/ constraintList c)
 /*@only@*/ constraintList constraintList_undump (FILE *f)
 {
   constraintList ret;
-  char *s = mstring_create (MAX_DUMP_LINE_LENGTH);
+  char *s;
   char *os;
   
   ret = constraintList_makeNew();
 
-  os = s;
+  os =  mstring_create (MAX_DUMP_LINE_LENGTH);
   s = fgets (os, MAX_DUMP_LINE_LENGTH, f);
 
   while (s != NULL && *s != ';')