Fixed problem with print format for +showalluses.

[splint.git] / src / flags.def

diff --git a/src/flags.def b/src/flags.def
index 3b0295935a6a0f71155ce24266cebbda31c97a86..921167eddbd88486a1df4d08d2a17722d02cd7d1 100644 (file)
--- a/src/flags.def
+++ b/src/flags.def
@@ -1845,7 +1845,6 @@ static flaglist flags =
     "A possibly non-nullterminated string/memory is used/referenced as a nullterminated one.",
     0, 0
   },
-
   {
     FK_BOUNDS, FK_MEMORY, specialFlag,
     "bounds",
@@ -1854,7 +1853,7 @@ static flaglist flags =
     "Memory read or write may be out of bounds of allocated storage.", 0, 0
   },
   {
-    FK_BOUNDS, FK_MEMORY, modeFlag,
+    FK_BOUNDS, FK_MEMORY, plainFlag,
     "boundsread",
     FLG_BOUNDSREAD,
     "possible out of bounds read",
@@ -1862,7 +1861,7 @@ static flaglist flags =
     0, 0
   },
   {
-    FK_BOUNDS, FK_MEMORY, modeFlag,
+    FK_BOUNDS, FK_MEMORY, plainFlag,
     "boundswrite",
     FLG_BOUNDSWRITE,
     "possible buffer overflow from an out of bounds write",
@@ -1871,7 +1870,7 @@ static flaglist flags =
   },
   
   {
-    FK_BOUNDS, FK_DISPLAY, modeFlag,
+    FK_BOUNDS, FK_DISPLAY, plainFlag,
     "fcnpost",
     FLG_FUNCTIONPOST,
     "display function post conditions",
@@ -1879,7 +1878,7 @@ static flaglist flags =
     0, 0
   },
   {
-    FK_BOUNDS, FK_DISPLAY, modeFlag,
+    FK_BOUNDS, FK_DISPLAY, plainFlag,
     "redundantconstraints",
     FLG_REDUNDANTCONSTRAINTS,
     "display seemingly redundant constraints",
@@ -1897,7 +1896,7 @@ static flaglist flags =
   },
 
   {
-    FK_BOUNDS, FK_MEMORY, modeFlag,
+    FK_BOUNDS, FK_MEMORY, plainFlag,
     "implictconstraint",
     FLG_IMPLICTCONSTRAINT,
     "generate implicit constraints for functions",
@@ -1906,7 +1905,7 @@ static flaglist flags =
   },
   /*drl7x added 4/29/01 */    
   {
-    FK_BOUNDS, FK_MEMORY, modeFlag,
+    FK_BOUNDS, FK_MEMORY, plainFlag,
     "orconstraint",
     FLG_ORCONSTRAINT,
     "use limited OR expressions to resolve constraints",
@@ -1915,7 +1914,7 @@ static flaglist flags =
   },
   
   {
-    FK_BOUNDS, FK_MEMORY, modeFlag,
+    FK_BOUNDS, FK_MEMORY, plainFlag,
     "nullterminated",
     FLG_NULLTERMINATEDWARNING,
     "misuse of nullterminated allocation",
@@ -1924,15 +1923,24 @@ static flaglist flags =
   },
   
   {
-    FK_BOUNDS, FK_DISPLAY, modeFlag,
+    FK_BOUNDS, FK_DISPLAY, plainFlag,
     "showconstraintparens",
     FLG_PARENCONSTRAINT,
     "display parentheses around constraint terms",
     NULL,
     0, 0
   },  
+  /*drl added 2/4/2002*/
   {
-    FK_BOUNDS, FK_DISPLAY, modeFlag,
+    FK_BOUNDS, FK_DISPLAY, plainFlag,
+    "boundscompacterrormessages",
+    FLG_BOUNDSCOMPACTERRORMESSAGES,
+    "Display fewer new lines in bounds checking error messages",
+    NULL,
+    0, 0
+  },  
+  {
+    FK_BOUNDS, FK_DISPLAY, plainFlag,
     "showconstraintlocation",
     FLG_CONSTRAINTLOCATION,
     "display location for every constraint generated",
@@ -2541,7 +2549,7 @@ static flaglist flags =
   {
     FK_NAMES, FK_ANSI, modeFlag,
     "isoreserved",
-    FLG_ANSIRESERVED,
+    FLG_ISORESERVED,
     "external name conflicts with name reserved for system or standard library",
     "External name is reserved for system use by ISO C99 standard.",
     0, 0
@@ -2559,7 +2567,7 @@ static flaglist flags =
   {
     FK_NAMES, FK_ANSI, modeFlag,
     "isoreservedinternal",
-    FLG_ANSIRESERVEDLOCAL,
+    FLG_ISORESERVEDLOCAL,
     "internal name conflicts with name reserved for system or standard library",
     "Internal name is reserved for system in ISO C99 standard (this should not be necessary unless you are worried about C library implementations that violate the standard and use macros).",
     0, 0
@@ -3131,8 +3139,8 @@ static flaglist flags =
   },
   {
     FK_DIRECT, FK_FILES, plainFlag,
-    "skipansiheaders",
-    FLG_SKIPANSIHEADERS,
+    "skipisoheaders",
+    FLG_SKIPISOHEADERS,
     "prevent inclusion of header files in a system directory with "
     "names that match standard ANSI headers. The symbolic information "
     "in the standard library is used instead.  Flag in effect only "
@@ -3523,7 +3531,8 @@ static flaglist flags =
     FK_SYNTAX, FK_PREPROC, plainFlag,
     "preproc",
     FLG_PREPROC,
-    "preprocessing error", NULL,
+    "preprocessing error",
+    "Preprocessing error.",
     0, 0
   },
 
@@ -4073,13 +4082,86 @@ static flaglist flags =
     "suppress herald and error count",
     NULL, 0, 0
   },
+
+  /*
+  ** Default is to send messages, warnings and errors to stderr
+  */
+
+  {
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "messagestreamstdout",
+    FLG_MESSAGESTREAMSTDOUT,
+    "send status messages to standard output stream",
+    NULL, 0, 0
+  },
   {
-    FK_DISPLAY, FK_ERRORS, plainFlag,
-    "usestderr",
-    FLG_USESTDERR,
-    "send error messages to standard error (instead of standard out)",
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "messagestreamstderr",
+    FLG_MESSAGESTREAMSTDERR,
+    "send status messages to standard error stream",
     NULL, 0, 0
   },
+  {
+    FK_DISPLAY, FK_ERRORS, globalStringFlag, ARG_FILE,
+    "messagestream",
+    FLG_MESSAGESTREAM,
+    "send status messages to <file>",
+    NULL, 0, 0
+  },
+
+  {
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "warningstreamstdout",
+    FLG_WARNINGSTREAMSTDOUT,
+    "send warnings to standard output stream",
+    NULL, 0, 0
+  },
+  {
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "warningstreamstderr",
+    FLG_WARNINGSTREAMSTDERR,
+    "send warnings to standard error stream",
+    NULL, 0, 0
+  },
+  {
+    FK_DISPLAY, FK_ERRORS, globalStringFlag, ARG_FILE,
+    "warningstream",
+    FLG_WARNINGSTREAM,
+    "send warnings to <file>",
+    NULL, 0, 0
+  },
+
+  {
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "errorstreamstdout",
+    FLG_ERRORSTREAMSTDOUT,
+    "send fatal errors to standard output stream",
+    NULL, 0, 0
+  },
+  {
+    FK_DISPLAY, FK_ERRORS, idemGlobalFlag,
+    "errorstreamstderr",
+    FLG_ERRORSTREAMSTDERR,
+    "send fatal errors to standard error stream",
+    NULL, 0, 0
+  },
+  {
+    FK_DISPLAY, FK_ERRORS, globalStringFlag, ARG_FILE,
+    "errorstream",
+    FLG_ERRORSTREAM,
+    "send fatal errors to <file>",
+    NULL, 0, 0
+  },
+  
+  {
+    FK_DISPLAY, FK_ERRORS, globalFlag,
+    "streamoverwrite",
+    FLG_STREAMOVERWRITE,
+    "warn and exit if a stream output file would overwrite an existing file",
+    NULL, 0, 0
+  },
+
+
   {
     FK_DISPLAY, FK_ERRORS, plainFlag,
     "showsummary",
@@ -4154,7 +4236,7 @@ static flaglist flags =
     NULL, 0, 0
   },
   {
-    FK_DEBUG, FK_BOUNDS, modeFlag,
+    FK_DEBUG, FK_BOUNDS, plainFlag,
     "debugfcnconstraint",
     FLG_DEBUGFUNCTIONCONSTRAINT,
     "debug function constraints",