Fixes for win32

[splint.git] / src / flags.c

diff --git a/src/flags.c b/src/flags.c
index 086fae0811d1d739fbe9c973af8a1174b5c9fd05..58063c89c580eca73050b727f2d0a9d870d68b5b 100644 (file)
--- a/src/flags.c
+++ b/src/flags.c
@@ -28,9 +28,9 @@
 # include "splintMacros.nf"
 # include "basic.h"
 # include "osd.h"
-# include "portab.h"
 # include "rcfiles.h"
 # include "lslinit.h"
+# include "llmain.h"
 
 /*
 ** from the CC man page:
@@ -128,6 +128,11 @@ typedef enum {
   ARG_SPECIAL   /* ? */
 } argcode;
 
+# ifdef WIN32
+/* Make Microsoft VC++ happy */
+# pragma warning (disable:4715)
+# endif
+
 static /*@observer@*/ cstring argcode_unparse (argcode arg)
 {
   switch (arg) 
@@ -143,14 +148,10 @@ static /*@observer@*/ cstring argcode_unparse (argcode arg)
     case ARG_SPECIAL:
       BADBRANCH;
     }
-# ifdef WIN32
-/* Make Microsoft VC++ happy */
-# pragma warning (disable:4715) 
-# endif
 }      
 
 # ifdef WIN32
-# pragma warning (enable:4715) 
+# pragma warning (default : 4715)
 # endif
 
 typedef struct { 
@@ -341,8 +342,6 @@ flagcode_recordError (flagcode f)
        }
       else
        {
-         /*drl bee: ec*/
-         /*drl bee: ec*/
          flags[f].nreported = flags[f].nreported + 1;
        }
     }
@@ -357,8 +356,7 @@ flagcode_recordSuppressed (flagcode f)
 {
   llassertprint (f != INVALID_FLAG, ("flagcode: %s", flagcode_unparse (f)));
 
-  /*drl bee: ec*/
-    /*drl bee: ec*/   flags[f].nsuppressed = flags[f].nsuppressed + 1;
+  flags[f].nsuppressed = flags[f].nsuppressed + 1;
 }
 
 int
@@ -374,7 +372,6 @@ flagcodeHint (flagcode f)
 {
   llassert (f != INVALID_FLAG);
 
-  /*drl bee: ec*/
   if (mstring_isDefined (flags[f].hint))
     {
       return (cstring_fromChars (flags[f].hint));
@@ -407,7 +404,6 @@ flagkind identifyCategory (cstring s)
 
   for (i = 0; categories[i].kind != FK_NONE; i++)
     {
-        /*drl bee: mRug*/
       if (mstring_isDefined (categories[i].name))
        {
          if (cstring_equalLit (s, categories[i].name))
@@ -426,7 +422,6 @@ static /*@observer@*/ cstring categoryName (flagkind kind)
 
   for (i = 0; categories[i].kind != FK_NONE; i++)
     {
-        /*drl bee: mrUg*/
       if (categories[i].kind == kind)
        {
          return (cstring_fromChars (categories[i].name));
@@ -442,7 +437,6 @@ static int categoryIndex (flagkind kind)
 
   for (i = 0; categories[i].kind != FK_NONE; i++)
     {
-        /*drl bee: mRug*/
       if (categories[i].kind == kind)
        {
          return i;
@@ -457,7 +451,6 @@ void printCategory (flagkind kind)
   int index = categoryIndex (kind);
 
   llassert (index >= 0);
-        /*drl bee: mRug*/
   llmsg (message ("%s (%d flags)\n\3%s\n\n", 
                  cstring_fromChars (categories[index].name), 
                  categorySize (kind),
@@ -480,7 +473,6 @@ listAllCategories (void)
 
   for (i = 0; categories[i].kind != FK_NONE; i++)
     {
-              /*drl bee: mRug*/
       flagkind kind = categories[i].kind ;
 
       if (categories[i].describe != NULL)
@@ -502,7 +494,6 @@ printAllFlags (bool desc, bool full)
 
       cstringSList_elements (fl, el)
        {
-         /*@i22@*/ /*find out why this is necessary*/
          cstring tmp;
          tmp = cstring_copy(el);
          llmsg (message ("%q\n\n", describeFlag (tmp)));
@@ -727,7 +718,6 @@ describeFlagCode (flagcode flag)
 
   context_resetAllFlags ();
   
-  /*drl bee: mRug*/
   f = flags[flag];
   ret = cstring_copy (cstring_fromChars (f.desc));
   
@@ -968,7 +958,6 @@ canonicalizeFlag (cstring s)
       } ;
   char *current;
   
-  /*drl bee: ia*/
   while ((current = transform[i]) != NULL)
     {
       if (cstring_containsLit (res, current))
@@ -1489,7 +1478,6 @@ extern int flagcode_valueIndex (flagcode f)
     {
       /* static valueFlags must be defined */
       /*@-usedef@*/
-      /*drl bee: sta*/
       if (f == valueFlags[i]) /*@=usedef@*/
        {
          return i;
@@ -1533,7 +1521,6 @@ extern int flagcode_stringIndex (flagcode f)
 
   for (i = 0; i < NUMSTRINGFLAGS; i++)
     {
-              /*drl bee: sta*/
       /*@-usedef@*/ if (f == stringFlags[i]) /*@=usedef@*/
        {
          return i;