fix the remaining MSVC warnings by setting individual #pragma(warning:disable) settings - this is very certainly not the way to go, but the way to prevent additional warnings rushing in ...

svn path=/trunk/; revision=21221

9 files changed, 44 insertions, 1 deletions

diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 2aea58c00c..d1fc247a2b 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -9,7 +9,7 @@ include ..\..\config.nmake
 
 include Makefile.common
 
-CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
 	$(NET_SNMP_CFLAGS) \
 	$(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \
 	$(KFW_CFLAGS) \
diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index 24578a7b43..09fa25714b 100644
--- a/epan/dissectors/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
@@ -22,6 +22,11 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-dfs.h"
 
+#ifdef _WIN32
+/* disable: warning C4101: 'xy' : unreferenced local variable */
+#pragma warning(disable:4101)
+#endif
+
 /* Ett declarations */
 static gint ett_dcerpc_netdfs = -1;
 static gint ett_netdfs_dfs_Info0 = -1;
diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c
index 0d3a2354d7..10ea01820d 100644
--- a/epan/dissectors/packet-dcerpc-eventlog.c
+++ b/epan/dissectors/packet-dcerpc-eventlog.c
@@ -22,6 +22,11 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-eventlog.h"
 
+#ifdef _WIN32
+/* disable: warning C4018: '<' : signed/unsigned mismatch */
+#pragma warning(disable:4018)
+#endif
+
 /* Ett declarations */
 static gint ett_dcerpc_eventlog = -1;
 static gint ett_eventlog_eventlogReadFlags = -1;
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index aff4ca63c1..38db00b795 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
@@ -22,6 +22,13 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-srvsvc.h"
 
+#ifdef _WIN32
+/* disable: warning C4101: 'xy' : unreferenced local variable */
+#pragma warning(disable:4101)
+/* disable: warning C4013: 'xy' undefined; assuming extern returning int */
+#pragma warning(disable:4013)
+#endif
+
 /* Ett declarations */
 static gint ett_dcerpc_srvsvc = -1;
 static gint ett_srvsvc_srvsvc_NetCharDevInfo0 = -1;
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c
index ef77bbad1e..a34d5b6303 100644
--- a/epan/dissectors/packet-dcerpc-winreg.c
+++ b/epan/dissectors/packet-dcerpc-winreg.c
@@ -13,6 +13,13 @@
 #include "config.h"
 #endif
 
+#ifdef _WIN32
+/* disable: warning C4005: 'xx' : macro redefinition */
+#pragma warning(disable:4005)
+/* disable: warning C4013: 'initshutdown_dissect_struct_String' undefined; assuming extern returning int */
+#pragma warning(disable:4013)
+#endif
+
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c
index 2cf4c09d6a..b36552a383 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.c
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.c
@@ -22,6 +22,11 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-wzcsvc.h"
 
+#ifdef _WIN32
+/* disable: warning C4101: 'xy' : unreferenced local variable */
+#pragma warning(disable:4101)
+#endif
+
 /* Ett declarations */
 static gint ett_dcerpc_wzcsvc = -1;
 
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 08a429c21e..867b1d447c 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -67,6 +67,10 @@
 #define PORT_MEGACO_TXT 2944
 #define PORT_MEGACO_BIN 2945
 
+#ifdef _WIN32
+/* disable: warning C4013: 'xy' undefined; assuming extern returning int */
+#pragma warning(disable:4013)
+#endif
 
 void proto_reg_handoff_megaco(void);
 
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 83bc561f8b..42bbde8775 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -55,6 +55,11 @@
 #define PSNAME "RRLP"
 #define PFNAME "rrlp"
 
+#ifdef _WIN32
+/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
+#pragma warning(disable:4146)
+#endif
+
 static dissector_handle_t rrlp_handle=NULL;
 
 
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 097e81689a..12a01426ef 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -36,6 +36,11 @@
 #include <epan/uat.h>
 #include <epan/emem.h>
 
+#ifdef _WIN32
+/* disable: warning C4090: 'XY' : different 'const' qualifiers */
+#pragma warning(disable:4090)
+#endif
+
 typedef struct _user_encap_t {
 	guint encap;
 	dissector_handle_t payload_proto;