Cleaned up flags to generate manual help.

[splint.git] / src / constraintList.c

diff --git a/src/constraintList.c b/src/constraintList.c
index e31ce7d9683ee778182c809f6728ea8d63b4df38..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
 **
@@ -91,7 +92,7 @@ constraintList_add (/*@returned@*/ constraintList s, /*@only@*/ constraint el)
   llassert (constraintList_isDefined (s));
 
   /*drl7x */
-  //   el = constraint_simplify (el);
+
   if (constraintList_resolve (el, s) )
     {
       constraint_free (el);
@@ -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
@@ -207,8 +210,7 @@ extern /*@only@*/ cstring constraintList_unparse ( /*@observer@*/ constraintList
   return (constraintList_print(s));
 }
 
-
-
+# if 0
 static /*@only@*/ cstring
 constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
 {
@@ -248,11 +250,11 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
        {
          st = message ("%q, %q", st, type);
        }
-    } //end for
+    } 
 
   return st;
 }
-     
+# endif
 
 /*@only@*/ cstring
 constraintList_print (/*@temp@*/ constraintList s) /*@*/
@@ -296,7 +298,7 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/
        {
          st = message ("%q, %q", st, type);
        }
-    } //end for
+    } 
 
   return st;
 }
@@ -385,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)) ) );
   
@@ -481,7 +483,6 @@ constraintList constraintList_preserveCallInfo (/*@returned@*/ constraintList c,
 
   constraintList_elements_private (c, el)
   {
-    //  el = constraint_preserveOrig (el);
     el = constraint_setFcnPre(el);
     el = constraint_origAddGeneratingExpr (el, fcn);
   }
@@ -573,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 != ';')
@@ -617,15 +618,11 @@ void constraintList_dump (/*@observer@*/ constraintList c,  FILE *f)
 
 constraintList constraintList_sort (/*@returned@*/ constraintList ret)
 {
-  
-  DPRINTF(( message("Before constraint_sort %q",  constraintList_printLocation(ret) ) ));
-  
   qsort (ret->elements, (size_t) ret->nelements,
-        (sizeof (*ret->elements) ), constraint_compare);
-
-    DPRINTF((message("After constraint_sort %q",  constraintList_printLocation(ret) ) ));
-
-    DPRINTF((message("onstraint_sort returning") ));
+        (sizeof (*ret->elements)), 
+        (int (*)(const void *, const void *)) constraint_compare);
+  
+  DPRINTF((message("onstraint_sort returning") ));
   return ret;
 }