Fixed internal bug reporting for redefinition of __func__

[splint.git] / src / cpplib.c

diff --git a/src/cpplib.c b/src/cpplib.c
index db2265e22c0e4fe1493a35d57561b865b27575d5..fd8356f0f665ef586f20ada6f6d4d3bae7b745fd 100644 (file)
--- a/src/cpplib.c
+++ b/src/cpplib.c
@@ -1823,7 +1823,7 @@ collect_expansion (cppReader *pfile, char *buf, char *limit,
       llfatalbug (cstring_makeLiteral ("Maximum definition size exceeded."));
     }
 
-  return defn;
+  /*@i1@*/ return defn; /* Spurious warning here */
 }
 
 /*
@@ -1887,7 +1887,6 @@ collect_expansionLoc (fileloc loc, char *buf, char *limit,
   defn->pattern = NULL;
   defn->nargs = nargs;
   defn->predefined = NULL;
-
   exp_p = defn->expansion = (char *) defn + sizeof (*defn);
 
   defn->line = 0;
@@ -2170,7 +2169,7 @@ collect_expansionLoc (fileloc loc, char *buf, char *limit,
       llfatalbug (cstring_makeLiteral ("Maximum definition size exceeded."));
     }
 
-  return defn;
+  /*@i1@*/ return defn; /* Spurious warning here */
 }
 
 /*
@@ -2838,7 +2837,7 @@ do_defineAux (cppReader *pfile, struct directive *keyword,
       else if (hp->type == T_CONST)
        ok = !CPPOPTIONS (pfile)->done_initializing;
       else {
-       BADBRANCH;
+       ok = FALSE; /* Redefining anything else is bad. */
       }
 
       /* Print the warning if it's not ok.  */
@@ -6669,7 +6668,7 @@ get_next:
 
         case '\\':
          c2 = cppReader_peekC (pfile);
-         //! allow other stuff here if a flag is set?
+         /* allow other stuff here if a flag is set? */
          DPRINTF (("Got continuation!"));
          if (c2 != '\n')
            goto randomchar;