[tools 2/2] Support for disabling and enabling warnings, handle warning number 2368

[Bolotov Sergey]

Signed-off-by: Bolotov Sergey <bolotov.s.s at yandex.ru>
---
 tools/widl/parser.h     |  1 +
 tools/widl/parser.l     | 35 +++++++++++++++++++++++++++++++++--
 tools/widl/write_msft.c |  3 ++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/tools/widl/parser.h b/tools/widl/parser.h
index c15d874..f48cacc 100644
--- a/tools/widl/parser.h
+++ b/tools/widl/parser.h
@@ -46,6 +46,7 @@ void pop_import(void);
 int is_type(const char *name);
 
 int do_warning(char *toggle, warning_list_t *wnum);
+int is_warning_enabled(int warning);
 
 extern char *temp_name;
 
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 65e0f45..92929aa 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -76,6 +76,8 @@ static int cbufalloc = 0;
 static int kw_token(const char *kw);
 static int attr_token(const char *kw);
 
+static warning_list_t *disabled_warnings = NULL;
+
 #define MAX_IMPORT_DEPTH 10
 struct {
   YY_BUFFER_STATE state;
@@ -559,17 +561,35 @@ void abort_import(void)
 
 static void warning_disable(int warning)
 {
-    printf("disable %d\n", warning);
+    warning_t *warning_entry;
+    LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry)
+        if(warning_entry->num == warning)
+            return;
+    warning_entry = xmalloc( sizeof(*warning_entry) );
+    warning_entry->num = warning;
+    list_add_tail(disabled_warnings, &warning_entry->entry);
 }
 
 static void warning_enable(int warning)
 {
-    printf("enable %d\n", warning);
+    warning_t *warning_entry;
+    LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry)
+        if(warning_entry->num == warning)
+        {
+            list_remove(&warning_entry->entry);
+            break;
+        }
 }
 
 int do_warning(char *toggle, warning_list_t *wnum)
 {
     warning_t *warning;
+    if(!disabled_warnings)
+    {
+        disabled_warnings = xmalloc( sizeof(*disabled_warnings) );
+        list_init( disabled_warnings );
+    }
+
     if(!strcmp(toggle, "disable"))
         LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry)
             warning_disable(warning->num);
@@ -580,3 +600,14 @@ int do_warning(char *toggle, warning_list_t *wnum)
         return 0;
     return 1;
 }
+
+int is_warning_enabled(int warning)
+{
+    warning_t *warning_entry;
+    if(!disabled_warnings)
+        return 1;
+    LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry)
+        if(warning_entry->num == warning)
+            return 0;
+    return 1;
+}
diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 8b65ead..137bb2d 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -51,6 +51,7 @@
 #include "header.h"
 #include "hash.h"
 #include "typetree.h"
+#include "parser.h"
 
 enum MSFT_segment_index {
     MSFT_SEG_TYPEINFO = 0,  /* type information */
@@ -504,7 +505,7 @@ static int ctl2_alloc_guid(
     offset = ctl2_find_guid(typelib, hash_key, &guid->guid);
     if (offset != -1)
     {
-        if (pedantic)
+        if (is_warning_enabled(2368))
             warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
                     guid->guid.Data1, guid->guid.Data2, guid->guid.Data3,
                     guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3],
-- 
1.9.1