fixed some /*@i---@*/ comments.

----------------------------------------------------------------------

diff --git a/src/Headers/constraint.h b/src/Headers/constraint.h
index 410febd206cffe2df3fe2b91b0fdb5bb81d9b5b7..7133a4237690cb6baac7622d4aa56865a3080986 100644 (file)
--- a/src/Headers/constraint.h
+++ b/src/Headers/constraint.h
@@ -35,7 +35,6 @@ extern void constraint_free (/*@only@*/  constraint p_c);
 
 /* constraint makeConstraintParse (sRef x, lltok relOp, exprNode cconstant); */
 
-/*@i22*/
 /*@-czechfcns*/
 
 extern constraint 

diff --git a/src/Makefile.am b/src/Makefile.am
index 00a07ca771f93090acb2f0c65b828c8e77bf0d73..d486f22bffe421ca146fae3687ff5e732c2576b1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -395,6 +395,9 @@ lintnew: splintme
 splintme: 
        ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw 
 
+splintmenosupcounts: 
+       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments  -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw 
+
 lintbuffercheck: 
        ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude $(LINTSRC) $(OVERFLOWCHSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw +bounds -DLINTBUFFERCHECK
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 5bc1b83023ca87c2dc34f0c97d55f3c4da8a5963..8ac5db39ab2594b71b674eea494bb87adbdb6b87 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1126,6 +1126,9 @@ lintnew: splintme
 splintme: 
        ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw 
 
+splintmenosupcounts: 
+       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments  -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw 
+
 lintbuffercheck: 
        ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude $(LINTSRC) $(OVERFLOWCHSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw +bounds -DLINTBUFFERCHECK
 

diff --git a/src/constraint.c b/src/constraint.c
index cc8218e48a36e6f139c5a257284a8144e4953f41..5109339c954f588fcd5b2a979c9fc2ebab726c61 100644 (file)
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -364,7 +364,8 @@ constraint constraint_makeSRefSetBufferSize (sRef s, long int size)
  ret->ar = EQ;
  ret->expr =  constraintExpr_makeIntLiteral ((int)size);
  ret->post = TRUE;
- /*@i1*/return ret;
+ /*@i1*/
+ return ret;
 }
 
 constraint constraint_makeSRefWriteSafeInt (sRef s, int ind)
@@ -376,7 +377,8 @@ constraint constraint_makeSRefWriteSafeInt (sRef s, int ind)
   ret->ar = GTE;
   ret->expr =  constraintExpr_makeIntLiteral (ind);
   ret->post = TRUE;
-  /*@i1*/return ret;
+  /*@i1*/
+  return ret;
 }
 
 /* drl added 01/12/2000
@@ -426,7 +428,7 @@ constraint constraint_makeSRefReadSafeInt (sRef s, int ind)
   ret->ar = GTE;
   ret->expr =  constraintExpr_makeIntLiteral (ind);
   ret->post = TRUE;
-  /*@i1*/return ret;
+  return ret;
 }
 
 constraint constraint_makeEnsureMaxReadAtLeast (exprNode t1, exprNode t2, fileloc sequencePoint)

diff --git a/src/constraintExprData.c b/src/constraintExprData.c
index e38034444def92e38c3c16bd7090ba9a17897b8b..24a064b7508c8887fdff4055468e37a4ea55c922 100644 (file)
--- a/src/constraintExprData.c
+++ b/src/constraintExprData.c
@@ -150,7 +150,8 @@ constraintExprData constraintExprData_termSetTerm (/*@returned@*/  constraintExp
 /*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));
-  /*@i22*/return data->term;
+  /*@i22*/
+  return data->term;
 }
 
 
@@ -212,7 +213,8 @@ constraintExpr  constraintExprData_binaryExprGetExpr1 (constraintExprData data)
 constraintExpr  constraintExprData_binaryExprGetExpr2 (constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));
-  /*@i22*/ return (data->binaryOp.expr2);
+  /*@i22*/ 
+  return (data->binaryOp.expr2);
 }
 
 

diff --git a/src/constraintResolve.c b/src/constraintResolve.c
index 024753f2fa8f1066f655beb3029fb57b6c022f36..fc9f96431599a4db245a9edf15c891a08fa54903 100644 (file)
--- a/src/constraintResolve.c
+++ b/src/constraintResolve.c
@@ -663,7 +663,7 @@ static bool constraint_conflict (constraint c1, constraint c2)
      strlen(str) == maxRead(s) + strlen(str);
   */
 
-  /*@i324234*/ /* clean this up */
+  /*@i324234*/ /*this code is functional but it may be worth cleaning up at some point. */
   
   if (c1->ar == EQ)
     if (c1->ar == c2->ar)
@@ -865,6 +865,7 @@ static bool  sizeofBufComp(constraintExpr buf1, constraintExpr expr2)
 */
 
 /*@i223@*/ /*need to add some type checking */
+
 static bool sizeOfMaxSet( /*@observer@*/ /*@temp@*/ constraint c)
 {
   constraintExpr l, r, buf1, buf2, con;

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index a27d76d442490b97b840aba7cb1981e2716b4e3b..8c4ce963238e42aa871e08616b526ef7dd9f74df 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -275,7 +275,7 @@ static cstring constraintTerm_getName (constraintTerm term)
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  /*wtf*/
+
       s = message ("%s", exprNode_unparse (term->value.expr) );
       break;
     case INTLITERAL:
@@ -303,7 +303,7 @@ constraintTerm_doSRefFixBaseParam (/*@returned@*/constraintTerm term, exprNodeLi
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  /*wtf*/
+
       break;
     case INTLITERAL:
       break;
@@ -328,7 +328,7 @@ cstring constraintTerm_print (constraintTerm term)  /*@*/
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  /*wtf*/
+
       s = message ("%s @ %q", exprNode_unparse (term->value.expr),
                   fileloc_unparse (term->loc) );
       break;