static void printIndentMessage (FILE *p_stream, /*@only@*/ cstring p_sc, int p_indent)
/*@modifies *p_stream@*/ ;
-static int lclerrors = 0;
-static size_t lastfileloclen = 10;
-static /*@only@*/ cstring lastmsg = cstring_undefined;
-static int mcount = 0;
+static bool s_scanOpen = FALSE;
+static int s_lclerrors = 0;
+static size_t s_lastfileloclen = 10;
+static /*@only@*/ cstring s_lastmsg = cstring_undefined;
+static int s_mcount = 0;
static /*@only@*/ cstring saveOneMessage = cstring_undefined;
static /*@only@*/ fileloc lastparseerror = fileloc_undefined;
static /*@only@*/ fileloc lastbug = fileloc_undefined;
/*@modifies g_csvstream@*/ ;
static void printError (FILE *p_stream, /*@only@*/ cstring p_sc)
- /*@globals lastfileloclen @*/
+ /*@globals s_lastfileloclen @*/
/*@modifies *p_stream@*/ ;
static void printMessage (FILE *p_stream, /*@only@*/ cstring p_s)
/*@modifies *p_stream@*/ ;
{
cstring desc = flagcodeHint (f1);
context_setNeednl ();
- lastfileloclen = 8;
+ s_lastfileloclen = 8;
if (cstring_isUndefined (desc))
{
{
cstring desc = flagcodeHint (f);
context_setNeednl ();
- lastfileloclen = 8;
+ s_lastfileloclen = 8;
if (flagcode_isNamePrefixFlag (f))
{
{
cstring desc = flagcodeHint (f);
context_setNeednl ();
- lastfileloclen = 8;
+ s_lastfileloclen = 8;
if (cstring_isDefined (desc))
{
typedef /*@null@*/ /*@dependent@*/ char *nd_charp;
+/*
+** mstring_split
+**
+** Divides a string into lines of up to maxline characters.
+**
+** Initial string: *sp
+**
+** Output split: *sp / *tp
+** possibly null
+*/
+
static void
mstring_split (/*@returned@*/ char **sp,
/*@out@*/ nd_charp *tp,
osp = s;
}
- nl = strchr (s, '\n');
-
/*
** splitting:
**
**
*/
+ nl = strchr (s, '\n');
+
if ((nl != NULL) && ((nl - s) < maxline))
{
*nl = '\0';
}
else if (size_toInt (strlen (s)) < maxline)
{
- llassertprotect (*tp == NULL || (*tp > osp));
+ llassertprotect (*tp == NULL);
return;
}
else
}
}
- while (*t != ' ' && *t != '\t' && i < MAXSEARCH)
+ /*
+ ** Search for any breaking point (at least 4 letters past s)
+ */
+
+ while (*t != ' ' && *t != '\t' && i < MAXSEARCH && t > (s + 4))
{
t--;
i++;
*tp = t;
-# if 0
- /* Hack to prevent error case for wierd strings. */
- if (t <= osp)
- {
- *tp = NULL;
- return;
- }
- llassertprotect (*tp == NULL || (*tp > osp));
-# endif
-
+ llassert (*sp != *tp);
return;
}
}
static
void limitmessage (/*@only@*/ cstring s, fileloc loc)
{
- if (mcount > context_getLimit () + 1)
+ if (s_mcount > context_getLimit () + 1)
{
cstring_free (s);
}
{
cstring flstring = fileloc_unparse (loc);
- lastfileloclen = cstring_length (flstring);
+ s_lastfileloclen = cstring_length (flstring);
cstring_free (saveOneMessage);
saveOneMessage = message ("%q: %q", flstring, s);
}
}
else
{
- int unprinted = mcount - context_getLimit ();
+ int unprinted = s_mcount - context_getLimit ();
if (unprinted > 0)
{
fprintf (g_warningstream, "%s: (%d more similar errors unprinted)\n",
cstring_toCharsSafe (fileloc_filename (g_currentloc)),
- mcount - context_getLimit ());
+ s_mcount - context_getLimit ());
}
}
}
- mcount = 0;
+ s_mcount = 0;
}
void
llgenmsg (/*@only@*/ cstring s, fileloc fl)
{
cstring flstring = fileloc_unparse (fl);
- lastfileloclen = cstring_length (flstring);
+ s_lastfileloclen = cstring_length (flstring);
prepareMessage ();
(void) printError (g_warningstream, message ("%q: %q", flstring, s));
hcode = FLG_MATCHANYINTEGRAL;
}
else
+ /*drl 4-270-2003 even if ignoresigns is set there may be another
+ problem that is causing splint to complain about a type error.
+ Don't tell the user that they can add +ignoresigns if it's
+ already on*/
{
- hcode = FLG_IGNORESIGNS;
+ DPRINTF(("TEST INGORESIGNS"));
+ if (context_getFlag(FLG_IGNORESIGNS) )
+ {
+ DPRINTF(("INGORESIGNS SET"));
+ hcode = FLG_IGNOREQUALS;
+ }
+
+ else
+ {
+ DPRINTF(("INGORESIGNS NOT SET"));
+ hcode = FLG_IGNORESIGNS;
+ }
}
}
else
*savechar = ':';
}
- if (cstring_equal (lastmsg, cstring_fromChars (tmpmsg)))
+ if (cstring_equal (s_lastmsg, cstring_fromChars (tmpmsg)))
{
- mcount++;
- if (mcount == (context_getLimit () + 1))
+ s_mcount++;
+ if (s_mcount == (context_getLimit () + 1))
{
limitmessage (s, fl);
return FALSE;
}
- if (mcount > (context_getLimit ()))
+ if (s_mcount > (context_getLimit ()))
{
cstring_free (s);
return FALSE;
else
{
cleanupMessages ();
- mcount = 0;
- cstring_free (lastmsg);
- lastmsg = cstring_fromCharsNew (tmpmsg);
+ s_mcount = 0;
+ cstring_free (s_lastmsg);
+ s_lastmsg = cstring_fromCharsNew (tmpmsg);
}
}
}
flstring = fileloc_unparse (fl);
- lastfileloclen = cstring_length (flstring);
+ s_lastfileloclen = cstring_length (flstring);
generateCSV (code, s, addtext, fl);
void printError (FILE *stream, /*@only@*/ cstring sc)
{
int maxlen = context_getLineLen ();
- size_t nspaces = lastfileloclen + 5;
+ size_t nspaces = s_lastfileloclen + 5;
int nextlen = maxlen - size_toInt (nspaces);
size_t len = cstring_length (sc);
int indent = 0;
static int numbugs = 0;
static bool inbug = FALSE;
+ context_recordBug ();
+
if (inbug)
{
cstring temps = fileloc_unparseRaw (file, line);
bool
lclHadError (void)
{
- return (lclerrors > 0);
+ return (s_lclerrors > 0);
}
bool
{
static int lastcall = 0;
- if (lclerrors > lastcall)
+ if (s_lclerrors > lastcall)
{
- lastcall = lclerrors;
+ lastcall = s_lclerrors;
return TRUE;
}
else
int
lclNumberErrors (void)
{
- return (lclerrors);
+ return (s_lclerrors);
}
void
xlclerror (char *srcFile, int srcLine, ltoken t, /*@only@*/ cstring msg)
{
- lclerrors++;
+ s_lclerrors++;
if (ltoken_getCode (t) != NOTTOKEN)
{
cstring loc = ltoken_unparseLoc (t);
- lastfileloclen = cstring_length (loc);
+ s_lastfileloclen = cstring_length (loc);
printError (g_warningstream, message ("%q: %q", loc, msg));
showSourceLoc (srcFile, srcLine);
void
lclplainerror (/*@only@*/ cstring msg)
{
- lclerrors++;
+ s_lclerrors++;
printError (g_warningstream, msg);
}
if (ltoken_getCode (t) != NOTTOKEN)
{
cstring loc = ltoken_unparseLoc (t);
- lastfileloclen = cstring_length (loc);
+ s_lastfileloclen = cstring_length (loc);
printError (g_errorstream, message ("%q: %q", loc, msg));
}
else
{
if (context_getFlag (code))
{
- if (!context_isInCommandLine ())
+ if (s_scanOpen)
{
displayScanClose ();
}
{
if (!context_isInCommandLine ())
{
- displayScanClose ();
+ if (s_scanOpen)
+ {
+ displayScanClose ();
+ }
+
lldiagmsg (s);
displayScanOpen (cstring_makeLiteral ("< more preprocessing ."));
}
(void) fflush (g_messagestream);
}
-static bool s_scanOpen = FALSE;
-
void displayScan (cstring msg)
{
if (s_scanOpen)