Fixed /*@i@*/ splintme errors.

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index 7093b6efe48731be4b496935b9186240efc422b3..f6284c6ea5d0de7719b63cf4b4546601559fec6d 100644 (file)
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -481,12 +481,13 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
         ret = constraintExpr_parseMakeBinaryOp (ce1, tok, ce2);         
        }
 
         ret = constraintExpr_parseMakeBinaryOp (ce1, tok, ce2);         
        }
 

-     
-     /*@i333*/
-     /* uncomment this block to activate the cheesy heuristic
-       for handling sizeof expressions
+
+        /* define this block to activate the cheesy heuristic
+       for handling sizeof expressions*/
+#if 0     
+

        
        

-     / *
+     /*

        drl 8-11-001
        
        We handle expressions containing sizeof with the rule
        drl 8-11-001
        
        We handle expressions containing sizeof with the rule


@@ -494,7 +495,7 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
 
        This is the total wronge way to do this but...
        it may be better than nothing
 
        This is the total wronge way to do this but...
        it may be better than nothing

-     * /
+     */

 
      
       
 
      
       


@@ -513,7 +514,8 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
           ret =  oldconstraintExpr_makeTermExprNode (e);
           }
        }
           ret =  oldconstraintExpr_makeTermExprNode (e);
           }
        }

-     */
+#endif
+     

      else
         ret = oldconstraintExpr_makeTermExprNode (e);
    
      else
         ret = oldconstraintExpr_makeTermExprNode (e);
    


@@ -553,7 +555,6 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
    case XPR_COMMA:
      t = exprData_getPairA(data);
      ret = constraintExpr_makeExprNode(t);
    case XPR_COMMA:
      t = exprData_getPairA(data);
      ret = constraintExpr_makeExprNode(t);

-     /*@i3434*/ /* drl: I'm not sure if this is right.  I'm adding a break to quiet Splint */

      break;
    default:
      ret = oldconstraintExpr_makeTermExprNode (e);
      break;
    default:
      ret = oldconstraintExpr_makeTermExprNode (e);


@@ -1480,10 +1481,7 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co
   DPRINTF ((message ("Doing constraintExpr_simplify:%s", constraintExpr_unparse (c) ) ) );  
   
 
   DPRINTF ((message ("Doing constraintExpr_simplify:%s", constraintExpr_unparse (c) ) ) );  
   
 

-  /*@i22*/

   
   

-  /* drl: I think this is an Splint bug */
-

   llassert ( constraintExpr_isDefined (c) );
   if (constraintExpr_isUndefined (c) )
     {
   llassert ( constraintExpr_isDefined (c) );
   if (constraintExpr_isUndefined (c) )
     {


@@ -2538,7 +2536,7 @@ static /*@only@*/ constraintExpr  constraintTerm_simpleDivTypeExprNode(/*@only@*
                }
              if (ctype_match (ctype_makePointer(ct2),ct) )
                {
                }
              if (ctype_match (ctype_makePointer(ct2),ct) )
                {

-                 /* sloopy way to do this... */ /*@i22*/
+                 /*a bit of a sloopy way to do this but... */

                                  constraintExpr_free(e);
                  return constraintExpr_makeExprNode(t1);
                }
                                  constraintExpr_free(e);
                  return constraintExpr_makeExprNode(t1);
                }


@@ -2556,7 +2554,6 @@ static /*@only@*/ constraintExpr  constraintTerm_simpleDivTypeExprNode(/*@only@*
 
 static /*@only@*/ constraintExpr simpleDivType (/*@only@*/ constraintExpr e, ctype ct)
 {
 
 static /*@only@*/ constraintExpr simpleDivType (/*@only@*/ constraintExpr e, ctype ct)
 {

-  /*@i333*/

   DPRINTF(( (message("simpleDiv got %s ", constraintExpr_unparse(e) ) )
            ));
 
   DPRINTF(( (message("simpleDiv got %s ", constraintExpr_unparse(e) ) )
            ));
 

diff --git a/src/constraintExprData.c b/src/constraintExprData.c
index 9ca1409e9c19d39fc5061c69c806f47d9a661310..ec5427ba69a41f2ce7243f3d31bb0351882bf6a9 100644 (file)
--- a/src/constraintExprData.c
+++ b/src/constraintExprData.c
@@ -155,7 +155,6 @@ constraintExprData_termSetTerm (/*@returned@*/ constraintExprData data,
 constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
 {
   llassert (constraintExprData_isDefined (data));
 constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data)
 {
   llassert (constraintExprData_isDefined (data));

-  /*@i22*/

   return data->term;
 }
 
   return data->term;
 }
 


@@ -218,7 +217,6 @@ constraintExpr constraintExprData_binaryExprGetExpr1 (constraintExprData data)
 constraintExpr constraintExprData_binaryExprGetExpr2 (constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));
 constraintExpr constraintExprData_binaryExprGetExpr2 (constraintExprData data)
 {
   llassert (constraintExprData_isDefined(data));

-  /*@i22*/ 

   return (data->binaryOp.expr2);
 }
 
   return (data->binaryOp.expr2);
 }