*** empty log message ***

diff --git a/src/Headers/constraintExprData.h b/src/Headers/constraintExprData.h
index 8ac86d5fed11b3471ad141ede6bcc0760a27146c..fc758f40afe6bc1b3c6a1515bd724910c6cc1dcd 100644 (file)
--- a/src/Headers/constraintExprData.h
+++ b/src/Headers/constraintExprData.h
@@ -42,7 +42,7 @@ typedef union constraintExprData
 }  * constraintExprData;
 
 /*@constant null constraintExprData constraintExprData_undefined; @*/
-# define constraintExprData_undefined ((constraintExprData)NULL)
+# define constraintExprData_undefined ((constraintExprData) NULL)
 
 extern /*@falsenull@*/ bool constraintExprData_isDefined ( /*@temp@*/ /*@observer@*/ /*@reldef@*/constraintExprData p_e) /*@*/ ;
 extern /*@unused@*/ /*@truenull@*/ bool constraintExprData_isUndefined (/*2oberserver@*/ constraintExprData p_e) /*@*/ ;

diff --git a/src/Headers/herald.h b/src/Headers/herald.h
index 5920a7a25e23cbd36eeb63499b9d4b800880dabb..b0c1a785d1daa9bd3d23635602020ef1cb2a028d 100644 (file)
--- a/src/Headers/herald.h
+++ b/src/Headers/herald.h
@@ -4,4 +4,4 @@
 /*@constant observer char *LCL_PARSE_VERSION;@*/
 # define LCL_PARSE_VERSION "LCLint 3.0b-alpha"
 /*@constant observer char *LCL_COMPILE;@*/
-# define LCL_COMPILE "Compiled using gcc -DSTDC_HEADERS=1 -g -Wall on Linux fowler 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by drl7x"
+# define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"

diff --git a/src/Headers/herald.last b/src/Headers/herald.last
index 5920a7a25e23cbd36eeb63499b9d4b800880dabb..b0c1a785d1daa9bd3d23635602020ef1cb2a028d 100644 (file)
--- a/src/Headers/herald.last
+++ b/src/Headers/herald.last
@@ -4,4 +4,4 @@
 /*@constant observer char *LCL_PARSE_VERSION;@*/
 # define LCL_PARSE_VERSION "LCLint 3.0b-alpha"
 /*@constant observer char *LCL_COMPILE;@*/
-# define LCL_COMPILE "Compiled using gcc -DSTDC_HEADERS=1 -g -Wall on Linux fowler 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by drl7x"
+# define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"

diff --git a/src/Headers/llerror.h b/src/Headers/llerror.h
index 35b89206ae96c4cd5dbb4677497ceb7a3842c7f5..88302f9c4e983e5eb7e0c22c028a099b405ed0b1 100644 (file)
--- a/src/Headers/llerror.h
+++ b/src/Headers/llerror.h
@@ -141,7 +141,6 @@ extern bool lclHadError (void);
 extern void lclRedeclarationError (ltoken p_id);
 # endif
 
-extern void flagWarning (/*@observer@*/ cstring p_s) /*@modifies g_msgstream@*/ ;
 extern void llerror_flagWarning (/*@only@*/ cstring p_s) /*@modifies g_msgstream@*/ ;
 
 extern /*@exits@*/ void llbugaux (cstring p_file, int p_line, /*@only@*/ cstring p_s) 

diff --git a/src/Headers/llmain.h b/src/Headers/llmain.h
index eff74f9495123627566c7d934d7b2791f57ed22c..179f8f3156bf04ba1ae3ed0e5668d9fce4d2e8da 100644 (file)
--- a/src/Headers/llmain.h
+++ b/src/Headers/llmain.h
@@ -33,18 +33,15 @@ extern int main (int p_argc, char *p_argv[])
 extern /*@exits@*/ void llexit (int p_status);      
 extern void showHerald (void);
 
-/*@-redecl@*/
+/*@-redecl@*/ /*@-incondefs@*/
 extern int yyparse (void);
-extern void yyrestart (FILE *);
+extern void yyrestart (/*@dependent@*/ FILE *);
 
 # ifndef NOLCL
 extern int ylparse (void);
 extern int lslparse (void);
 # endif
 
-/*@=redecl@*/
-
-/*@-incondefs@*/ /*@-redecl@*/
 extern /*@open@*/ /*@dependent@*/ FILE *yyin;
 /*@=incondefs@*/ /*@=redecl@*/
 

diff --git a/src/Headers/local_constants.h b/src/Headers/local_constants.h
index 73e13fc02ff2ff0ec28919e4f5adc9cc5c4dac80..c4c3a887ac645344e32355e5979556d4d408aa9a 100644 (file)
--- a/src/Headers/local_constants.h
+++ b/src/Headers/local_constants.h
@@ -2,6 +2,6 @@
 /*@constant observer char *SYSTEM_LIBDIR;@*/
 # define SYSTEM_LIBDIR "/usr/include"
 /*@constant observer char *DEFAULT_LARCHPATH;@*/
-# define DEFAULT_LARCHPATH ".:/af9/drl7x/re3/LCLintDev/lib"
+# define DEFAULT_LARCHPATH "/usr/local/lclint-2.5m/lib"
 /*@constant observer char *DEFAULT_LCLIMPORTDIR;@*/
-# define DEFAULT_LCLIMPORTDIR "/af9/drl7x/re3/LCLintDev/imports"
+# define DEFAULT_LCLIMPORTDIR "/usr/local/lclint-2.5m/imports"

diff --git a/src/Headers/local_constants.last b/src/Headers/local_constants.last
index 73e13fc02ff2ff0ec28919e4f5adc9cc5c4dac80..c4c3a887ac645344e32355e5979556d4d408aa9a 100644 (file)
--- a/src/Headers/local_constants.last
+++ b/src/Headers/local_constants.last
@@ -2,6 +2,6 @@
 /*@constant observer char *SYSTEM_LIBDIR;@*/
 # define SYSTEM_LIBDIR "/usr/include"
 /*@constant observer char *DEFAULT_LARCHPATH;@*/
-# define DEFAULT_LARCHPATH ".:/af9/drl7x/re3/LCLintDev/lib"
+# define DEFAULT_LARCHPATH "/usr/local/lclint-2.5m/lib"
 /*@constant observer char *DEFAULT_LCLIMPORTDIR;@*/
-# define DEFAULT_LCLIMPORTDIR "/af9/drl7x/re3/LCLintDev/imports"
+# define DEFAULT_LCLIMPORTDIR "/usr/local/lclint-2.5m/imports"

diff --git a/src/context.c b/src/context.c
index db8cc97fa9f6d5bd99b53f71ec00dc3806e5d491..4469ed933a062366d8e0e9eeeb21de92159cb2cc 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -2583,21 +2583,16 @@ context_setValue (flagcode flag, int val)
       if (val <= 0)
        {
          
-         cstring warn = message ("Value for %s must be a positive "
-                                 "number (given %d)",
-                                 flagcode_unparse (flag), val);
-         
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("Value for %s must be a positive "
+                                   "number (given %d)",
+                                   flagcode_unparse (flag), val));
          return;
        }
       if (flag == FLG_LINELEN && val < MINLINELEN)
        {
-         cstring warn = message ("Value for %s must be at least %d (given %d)",
-                                 flagcode_unparse (flag), 
-                                 MINLINELEN, val);
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("Value for %s must be at least %d (given %d)",
+                                   flagcode_unparse (flag), 
+                                   MINLINELEN, val));
          val = MINLINELEN;
        }
       break;
@@ -2611,12 +2606,9 @@ context_setValue (flagcode flag, int val)
       if (val < 0)
        {
          
-         cstring warn = message ("Value for %s must be a non-negative "
-                                 "number (given %d)",
-                                 flagcode_unparse (flag), val);
-         
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("Value for %s must be a non-negative "
+                                   "number (given %d)",
+                                   flagcode_unparse (flag), val));
          return;
        }
 
@@ -2704,9 +2696,7 @@ context_setString (flagcode flag, cstring val)
 
              if (cstring_getChar (tval, n) != '\"')
                {
-                 cstring msg = message ("Setting -systemdirs to string with unmatching quotes: %s", val);
-                 flagWarning (msg);
-                 cstring_free (msg);
+                 llerror_flagWarning (message ("Setting -systemdirs to string with unmatching quotes: %s", val));
                }
              else
                {
@@ -2745,13 +2735,10 @@ context_setString (flagcode flag, cstring val)
   if (cstring_length (val) >= 1
       && cstring_firstChar (val) == '"')
     {
-      cstring s = message
-                  ("setting %s to string beginning with \".  You probably "
-                   "don't meant to have the \"'s.",
-                   flagcode_unparse (flag));
-
-      flagWarning (s);
-      cstring_free (s);
+      llerror_flagWarning (message
+                      ("setting %s to string beginning with \".  You probably "
+                       "don't meant to have the \"'s.",
+                       flagcode_unparse (flag)));
     }
 
   if (flag == FLG_BOOLTYPE)
@@ -3377,10 +3364,10 @@ context_userSetFlag (flagcode f, bool b)
     {
       if (gc.flags[FLG_EXPORTHEADER])
        {
-         flagWarning (cstring_makeLiteralTemp
-                      ("setting +neverinclude after +exportheader.  "
-                       "Turning off exportheader, since headers are not checked "
-                       "when +neverinclude is used."));
+         llerror_flagWarning (cstring_makeLiteral
+                          ("setting +neverinclude after +exportheader.  "
+                           "Turning off exportheader, since headers are not checked "
+                           "when +neverinclude is used."));
 
          gc.flags[FLG_EXPORTHEADER] = FALSE;
        }
@@ -3391,10 +3378,10 @@ context_userSetFlag (flagcode f, bool b)
        {
          if (gc.flags[FLG_NEVERINCLUDE])
            {
-             flagWarning (cstring_makeLiteralTemp
-                          ("setting +exportheader after +neverinclude.  "
-                           "Not setting exportheader, since headers are not checked "
-                           "when +neverinclude is used."));
+             llerror_flagWarning (cstring_makeLiteral
+                              ("setting +exportheader after +neverinclude.  "
+                               "Not setting exportheader, since headers are not checked "
+                               "when +neverinclude is used."));
              gc.flags[FLG_EXPORTHEADER] = FALSE;
              return;
            }
@@ -3410,11 +3397,9 @@ context_userSetFlag (flagcode f, bool b)
          && !flagcode_isIdemFlag (f)
          && !flagcode_hasArgument (f))
        {
-         cstring warn = message ("setting %s%s redundant with current value", 
-                                 cstring_makeLiteralTemp (b ? "+" : "-"),
-                                 flagcode_unparse (f));
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("setting %s%s redundant with current value", 
+                                   cstring_makeLiteralTemp (b ? "+" : "-"),
+                                   flagcode_unparse (f)));
        }
     }
 
@@ -3422,10 +3407,8 @@ context_userSetFlag (flagcode f, bool b)
     {
       if (!context_getFlag (FLG_WARNUSE))
        {
-         cstring warn = message ("flag +%s is canceled by -warnuse",
-                                 flagcode_unparse (f));
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("flag +%s is canceled by -warnuse",
+                                   flagcode_unparse (f)));
          
        }
     }
@@ -3436,29 +3419,34 @@ context_userSetFlag (flagcode f, bool b)
       if (gc.library != FLG_ANSILIB
          && gc.library != f)
        {
-         cstring warn = message ("selecting library %s after library %s was "
-                                 "selected (only one library may be used)",
-                                 flagcode_unparse (f),
-                                 flagcode_unparse (gc.library));
-         flagWarning (warn);
-         cstring_free (warn);
+         llerror_flagWarning (message ("selecting library %s after library %s was "
+                                       "selected (only one library may be used)",
+                                       flagcode_unparse (f),
+                                       flagcode_unparse (gc.library)));
        }
 
       if (f == FLG_UNIXLIB)
        {
          if (context_getFlag (FLG_WARNUNIXLIB))
            {
-             flagWarning (cstring_makeLiteralTemp 
-                          ("selecting unix library.  Unix library is "
-                           "ad hoc addition to POSIX library.  Recommend "
-                           "use +posixlib to select POSIX library instead. "
-                           "Use -warnunixlib to suppress this message."));
+             llerror_flagWarning (cstring_makeLiteral
+                                  ("selecting unix library.  Unix library is "
+                                   "ad hoc addition to POSIX library.  Recommend "
+                                   "use +posixlib to select POSIX library instead. "
+                                   "Use -warnunixlib to suppress this message."));
            }
        }
       
       gc.library = f;
     }
-  
+
+  if (flagcode_isNameChecksFlag (f) && b && !context_maybeSet (FLG_NAMECHECKS))
+    {
+      llerror_flagWarning (message
+                          ("setting +%s will not produce warnings with -namechecks. Must set +namechecks also.",
+                           flagcode_unparse (f)));
+    }
+
   gc.setGlobally[f] = TRUE;
   context_setFlag (f, b);
 }

diff --git a/src/flags.c b/src/flags.c
index 299e05a2c0540c9b5e41778f9bf2cdda48515aed..37ea7e003a4577bca53088592268fea364cc9584 100644 (file)
--- a/src/flags.c
+++ b/src/flags.c
@@ -886,8 +886,8 @@ identifyFlag (cstring s)
   
   if (cstring_equalLit (s, "accessunspec"))
     {
-      flagWarning 
-       (cstring_makeLiteralTemp
+      llerror_flagWarning 
+       (cstring_makeLiteral
         ("accessunspec flag is not supported by LCLint version 2.0 or "
          "later.  It has been replaced by accessmodule, accessfile and "
          "accessfunction to provide more precise control of accessibility "
@@ -899,8 +899,8 @@ identifyFlag (cstring s)
 
   if (cstring_equalLit (s, "staticmods"))
     {
-      flagWarning 
-       (cstring_makeLiteralTemp
+      llerror_flagWarning 
+       (cstring_makeLiteral
         ("staticmods flag is obsolete.  You probably "
          "want impcheckmodstatics.  For more information, "
          "see lclint -help impcheckmodstatics"));
@@ -910,26 +910,26 @@ identifyFlag (cstring s)
 
   if (cstring_equalLit (s, "bool"))
     {
-      flagWarning
-       (cstring_makeLiteralTemp ("bool flag is obsolete.  It never really "
-                                 "made sense in the first place."));
+      llerror_flagWarning
+       (cstring_makeLiteral ("bool flag is obsolete.  It never really "
+                             "made sense in the first place."));
       
       return SKIP_FLAG;
     }
   
   if (cstring_equalLit (s, "ansi"))
     {
-      flagWarning
-       (cstring_makeLiteralTemp ("ansi flag is obsolete.  You probably "
-                                 "want noparams and/or oldstyle."));
+      llerror_flagWarning
+       (cstring_makeLiteral ("ansi flag is obsolete.  You probably "
+                             "want noparams and/or oldstyle."));
       
       return SKIP_FLAG;
     }
     
   if (cstring_equalLit (s, "stdio"))
     {
-      flagWarning 
-       (cstring_makeLiteralTemp
+      llerror_flagWarning 
+       (cstring_makeLiteral
         ("stdio flag is obsolete.  You may "
          "want strictlib or one of the gloabls "
          "checking flags.  For more information, "

diff --git a/src/lclint.lcd b/src/lclint.lcd
index 62c7ca1f909bd4c729518fe47d45ff865bde7322..d41167a51db90945728731bd8c01ff5cc6d45e6b 100644 (file)
--- a/src/lclint.lcd
+++ b/src/lclint.lcd
@@ -2379,8 +2379,8 @@
 3 f2 ()!
 3 f0 (995|0@5@7&#,)!
 3 f1 (995|0@5@7&#,)!
-3 f0 (1145|0@5@19@3@0#,)!
-3 f1 (1145|0@5@19@3@0#,)!
+3 f0 (1145|0@5@2&#,)!
+3 f1 (1145|0@5@2&#,)!
 3 f0 (1145|0@5@7&#,5|$#,1145|0@5@2&#,)!
 3 f1 (1145|0@5@7&#,5|$#,1145|0@5@2&#,)!
 3 f0 (1145|0@5@2&#,)!
@@ -9050,7 +9050,7 @@
 3 f5 ()!
 3 f0 (5|^#,)!
 3 f1 (5|^#,)!
-3 f1 (211|^#,)!
+3 f1 (211|0@0@18&#,)!
 3 f0 (5|^#,)!
 3 f1 (5|^#,)!
 3 f1 (8901|^#,)!
@@ -10407,8 +10407,8 @@
 3 f1 ()!
 3 f0 ()!
 3 f5 ()!
-3 f0 (211|^#,)!
-3 f1 (211|^#,)!
+3 f0 (211|0@0@18&#,)!
+3 f1 (211|0@0@18&#,)!
 3 f0 ()!
 3 f5 ()!
 3 f0 ()!
@@ -13732,8 +13732,8 @@
 3 f1 (1145|0@5@2&#,)!
 3 f0 (1145|0@5@2&#,)!
 3 f1 (1145|0@5@2&#,)!
-3 f0 (1145|0@5@19@3@0#,)!
-3 f1 (1145|0@5@19@3@0#,)!
+3 f0 (1145|0@5@2&#,)!
+3 f1 (1145|0@5@2&#,)!
 3 f0 (1145|0@5@2&#,)!
 3 f1 (1145|0@5@2&#,)!
 3 f0 (1145|0@5@2&#,)!
@@ -23291,7 +23291,7 @@
 ^3329 13808$$$@0#lclplainerror
 ^3330 13800$$$@0#lclHadError
 ^3331 13814$$$@0#lclRedeclarationError
-^3332 13731$@0@g2534@0@0@1@g2534$@0#flagWarning
+^3332 13731$@0@g2534@0@0@1@g2534$@0#llerror_flagWarning
 ^3333 13790@6@0@6@0@0@1@g2534@6@0,g2533@6@5@1@tg2534$@0#llbugaux
 ^3334 13844$@0@g2534@0@0@1@tg2534$@0#llquietbugaux
 ^3335 2390$@1@g2534@6@0,g2533@6@5,s1@1@g2534,s1$@0#cleanupMessages

diff --git a/src/llerror.c b/src/llerror.c
index 3442b801e648f822f803a104d0088c0a697ae897..c1ab4b6a3e3fd8c203a6b438ee5ca3bd011db60c 100644 (file)
--- a/src/llerror.c
+++ b/src/llerror.c
@@ -246,19 +246,36 @@ llsuppresshint2 (char c, flagcode f1, flagcode f2)
              f2 = FLG_NAMECHECKS;
            }
 
-         if (cstring_isDefined (desc))
+         if (f1 == f2)
            {
-             llgenhint (message ("%s (Setting either %h%s or %h%s will suppress message)", desc, 
-                                 c,
-                                 flagcode_unparse (f1),
-                                 c,
-                                 flagcode_unparse (f2)));
+             if (cstring_isDefined (desc))
+               {
+                 llgenhint (message ("%s (Setting %h%s will suppress message)", desc,
+                                     c,
+                                     flagcode_unparse (f1)));
+               }
+             else
+               {
+                 llgenhint (message ("(Setting %h%s will suppress message)", 
+                                     c, flagcode_unparse (f1)));
+               }
            }
          else
            {
-             llgenhint (message ("(Setting either %h%s or %h%s will suppress message)", c,
-                                 flagcode_unparse (f1),
-                                 c, flagcode_unparse (f2)));
+             if (cstring_isDefined (desc))
+               {
+                 llgenhint (message ("%s (Setting either %h%s or %h%s will suppress message)", desc, 
+                                     c,
+                                     flagcode_unparse (f1),
+                                     c,
+                                     flagcode_unparse (f2)));
+               }
+             else
+               {
+                 llgenhint (message ("(Setting either %h%s or %h%s will suppress message)", c,
+                                     flagcode_unparse (f1),
+                                     c, flagcode_unparse (f2)));
+               }
            }
        }
     }

diff --git a/src/nameChecks.c b/src/nameChecks.c
index 1ddfc306edd7ba21dfcebafa60172e8e98695c88..68f8d7d693f0b5ea4070d9bbd352ff3ae0843442 100644 (file)
--- a/src/nameChecks.c
+++ b/src/nameChecks.c
@@ -340,6 +340,8 @@ checkPrefix (uentry ue)
       
       if (!matchPrefix (name, context_getString (flag)))
        {
+         llassert (flag != FLG_NAMECHECKS);
+
          if (optgenerror2
              (flag, FLG_NAMECHECKS,
               message ("%s %s name is not consistent with %s "

diff --git a/src/uentry.c b/src/uentry.c
index 06be66a73ca4641f1d7328417c8d42798cc4c39e..9f5f3a5bc7f20fdce4163fae9e9f99ab2c5084fe 100644 (file)
--- a/src/uentry.c
+++ b/src/uentry.c
@@ -7701,22 +7701,25 @@ checkMetaState (/*@notnull@*/ uentry old, /*@notnull@*/ uentry unew,
                        }
                      else
                        {
-                         if (mustConform 
-                             && optgenerror 
-                             (FLG_INCONDEFS,
-                              message ("%s %q inconsistently %rdeclared %s %s, %s as %s",
-                                       uentry_ekindName (unew),
-                                       uentry_getName (unew),
-                                       uentry_isDeclared (old),
-                                       fcnErrName (unew),
-                                       metaStateInfo_unparseValue (msinfo, 
-                                                                   stateValue_getValue (newval)),
-                                       uentry_specOrDefName (old),
-                                       metaStateInfo_unparseValue (msinfo,
-                                                                   stateValue_getValue (oldval))),
-                              uentry_whereDeclared (unew)))
+                         if (!stateValue_isError (newval))
                            {
-                             uentry_showWhereSpecified (old);
+                             if (mustConform 
+                                 && optgenerror 
+                                 (FLG_INCONDEFS,
+                                  message ("%s %q inconsistently %rdeclared %s %s, %s as %s",
+                                           uentry_ekindName (unew),
+                                           uentry_getName (unew),
+                                           uentry_isDeclared (old),
+                                           fcnErrName (unew),
+                                           metaStateInfo_unparseValue (msinfo, 
+                                                                       stateValue_getValue (newval)),
+                                           uentry_specOrDefName (old),
+                                           metaStateInfo_unparseValue (msinfo,
+                                                                       stateValue_getValue (oldval))),
+                                  uentry_whereDeclared (unew)))
+                               {
+                                 uentry_showWhereSpecified (old);
+                               }
                            }
                        }
                      

diff --git a/test/czechnames.expect b/test/czechnames.expect
index 3fe4ae9ff5da8bfebf57275202fc828d66f94998..02f01e2b8d2d6f0a47113e2b70decfa75c46f7eb 100644 (file)
--- a/test/czechnames.expect
+++ b/test/czechnames.expect
@@ -3,19 +3,19 @@ Finished LCLint checking --- no code errors found
 
 czechnames.c:5:5: Variable michelob_light name violates Czech naming
     convention.  Czech prefix michelob is not the name of a type.
-  Variable name is not consistent with Czech naming convention. (-czechvars
-  will suppress message)
+  Variable name is not consistent with Czech naming convention. (Setting either
+  -czechvars or -namechecks will suppress message)
 czechnames.c:26:5: Function budweiser name is not consistent with Czech naming
                       convention.  Accessible types: pivo
   Function or iterator name is not consistent with Czech naming convention.
-  (-czechfcns will suppress message)
+  (Setting either -czechfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected
 
 czechnames.c:26:5: Function budweiser name is not consistent with Czech naming
                       convention.  Accessible types: pivo
   Function or iterator name is not consistent with Czech naming convention.
-  (-czechfcns will suppress message)
+  (Setting either -czechfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
@@ -24,6 +24,8 @@ czechnames.c:4:5: Variable pivo_pyet name violates Czech naming convention.
   Use +accessczech to allow access to type <t> in functions named <t>_<name>.
 czechnames.c:5:5: Variable michelob_light name violates Czech naming
     convention.  Czech prefix michelob is not the name of a type.
+  Variable name is not consistent with Czech naming convention. (Setting either
+  -czechvars or -namechecks will suppress message)
 czechnames.c:8:17: Constant pivo_devenast name violates Czech naming
     convention. Czech prefix pivo names an abstract type that is not
     accessible.

diff --git a/test/czechnames.out b/test/czechnames.out
index 3fe4ae9ff5da8bfebf57275202fc828d66f94998..02f01e2b8d2d6f0a47113e2b70decfa75c46f7eb 100644 (file)
--- a/test/czechnames.out
+++ b/test/czechnames.out
@@ -3,19 +3,19 @@ Finished LCLint checking --- no code errors found
 
 czechnames.c:5:5: Variable michelob_light name violates Czech naming
     convention.  Czech prefix michelob is not the name of a type.
-  Variable name is not consistent with Czech naming convention. (-czechvars
-  will suppress message)
+  Variable name is not consistent with Czech naming convention. (Setting either
+  -czechvars or -namechecks will suppress message)
 czechnames.c:26:5: Function budweiser name is not consistent with Czech naming
                       convention.  Accessible types: pivo
   Function or iterator name is not consistent with Czech naming convention.
-  (-czechfcns will suppress message)
+  (Setting either -czechfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected
 
 czechnames.c:26:5: Function budweiser name is not consistent with Czech naming
                       convention.  Accessible types: pivo
   Function or iterator name is not consistent with Czech naming convention.
-  (-czechfcns will suppress message)
+  (Setting either -czechfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
@@ -24,6 +24,8 @@ czechnames.c:4:5: Variable pivo_pyet name violates Czech naming convention.
   Use +accessczech to allow access to type <t> in functions named <t>_<name>.
 czechnames.c:5:5: Variable michelob_light name violates Czech naming
     convention.  Czech prefix michelob is not the name of a type.
+  Variable name is not consistent with Czech naming convention. (Setting either
+  -czechvars or -namechecks will suppress message)
 czechnames.c:8:17: Constant pivo_devenast name violates Czech naming
     convention. Czech prefix pivo names an abstract type that is not
     accessible.

diff --git a/test/czechoslovaknames.expect b/test/czechoslovaknames.expect
index ea8ab604761fd376453bc32c28c27557f3dfe9a5..8a730410dd469e11bc8080422774d34a9ba58bb3 100644 (file)
--- a/test/czechoslovaknames.expect
+++ b/test/czechoslovaknames.expect
@@ -1,25 +1,25 @@
 
 czechnames.c:26:5: Function budweiser name is not consistent with Czechoslovak
                       naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
 slovaknames.c:32:5: Function budweiser name is not consistent with Czechoslovak
                        naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
-  Variable name is not consistent with Slovak naming convention. (-slovakvars
-  will suppress message)
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Czechoslovak
                        naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected

diff --git a/test/czechoslovaknames.out b/test/czechoslovaknames.out
index ea8ab604761fd376453bc32c28c27557f3dfe9a5..8a730410dd469e11bc8080422774d34a9ba58bb3 100644 (file)
--- a/test/czechoslovaknames.out
+++ b/test/czechoslovaknames.out
@@ -1,25 +1,25 @@
 
 czechnames.c:26:5: Function budweiser name is not consistent with Czechoslovak
                       naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
 slovaknames.c:32:5: Function budweiser name is not consistent with Czechoslovak
                        naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 1 code error found, as expected
 
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
-  Variable name is not consistent with Slovak naming convention. (-slovakvars
-  will suppress message)
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Czechoslovak
                        naming convention.
-  Function name is not consistent with Czechoslovak naming convention.
-  (-czechoslovakfcns will suppress message)
+  Function name is not consistent with Czechoslovak naming convention. (Setting
+  either -czechoslovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected

diff --git a/test/slovaknames.expect b/test/slovaknames.expect
index 1e6d375283b97f87df3ea80aff321b9e70ac8808..f093b9db41dcb31631af3a023f1964a82b05d895 100644 (file)
--- a/test/slovaknames.expect
+++ b/test/slovaknames.expect
@@ -10,23 +10,27 @@ Finished LCLint checking --- no code errors found
 
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
-  Variable name is not consistent with Slovak naming convention. (-slovakvars
-  will suppress message)
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:19:5: Function samAdams name violates Slovak naming convention. 
                        Slovak prefix sam is not the name of a type.
   Function or iterator name is not consistent with Slovak naming convention.
-  (-slovakfcns will suppress message)
+  (Setting either -slovakfcns or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Slovak
                        naming convention.  Accessible types: pivo
+  Function or iterator name is not consistent with Slovak naming convention.
+  (Setting either -slovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 3 code errors found, as expected
 
 slovaknames.c:19:5: Function samAdams name violates Slovak naming convention. 
                        Slovak prefix sam is not the name of a type.
   Function or iterator name is not consistent with Slovak naming convention.
-  (-slovakfcns will suppress message)
+  (Setting either -slovakfcns or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Slovak
                        naming convention.  Accessible types: pivo
+  Function or iterator name is not consistent with Slovak naming convention.
+  (Setting either -slovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected
 
@@ -35,6 +39,8 @@ slovaknames.c:4:5: Variable pivoPyet name violates Slovak naming convention.
   Use +accessslovak to allow access to type <t> in functions named <t>_<name>.
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:8:17: Constant pivoDevenast name violates Slovak naming
     convention. Slovak prefix pivo names an abstract type that is not
     accessible.

diff --git a/test/slovaknames.out b/test/slovaknames.out
index 1e6d375283b97f87df3ea80aff321b9e70ac8808..f093b9db41dcb31631af3a023f1964a82b05d895 100644 (file)
--- a/test/slovaknames.out
+++ b/test/slovaknames.out
@@ -10,23 +10,27 @@ Finished LCLint checking --- no code errors found
 
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
-  Variable name is not consistent with Slovak naming convention. (-slovakvars
-  will suppress message)
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:19:5: Function samAdams name violates Slovak naming convention. 
                        Slovak prefix sam is not the name of a type.
   Function or iterator name is not consistent with Slovak naming convention.
-  (-slovakfcns will suppress message)
+  (Setting either -slovakfcns or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Slovak
                        naming convention.  Accessible types: pivo
+  Function or iterator name is not consistent with Slovak naming convention.
+  (Setting either -slovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 3 code errors found, as expected
 
 slovaknames.c:19:5: Function samAdams name violates Slovak naming convention. 
                        Slovak prefix sam is not the name of a type.
   Function or iterator name is not consistent with Slovak naming convention.
-  (-slovakfcns will suppress message)
+  (Setting either -slovakfcns or -namechecks will suppress message)
 slovaknames.c:32:5: Function budweiser name is not consistent with Slovak
                        naming convention.  Accessible types: pivo
+  Function or iterator name is not consistent with Slovak naming convention.
+  (Setting either -slovakfcns or -namechecks will suppress message)
 
 Finished LCLint checking --- 2 code errors found, as expected
 
@@ -35,6 +39,8 @@ slovaknames.c:4:5: Variable pivoPyet name violates Slovak naming convention.
   Use +accessslovak to allow access to type <t> in functions named <t>_<name>.
 slovaknames.c:5:5: Variable michelobLight name violates Slovak naming
     convention.  Slovak prefix michelob is not the name of a type.
+  Variable name is not consistent with Slovak naming convention. (Setting
+  either -slovakvars or -namechecks will suppress message)
 slovaknames.c:8:17: Constant pivoDevenast name violates Slovak naming
     convention. Slovak prefix pivo names an abstract type that is not
     accessible.