Removed some of the unix related warnings. I'll remove the remaining DCOM related ones in the next days, step by step (by looking at the buildbot output).

svn path=/trunk/; revision=12793

3 files changed, 8 insertions, 23 deletions

diff --git a/epan/dissectors/packet-dcom-cba-acco.c b/epan/dissectors/packet-dcom-cba-acco.c
index 85f52a24a5..1275e4c855 100644
--- a/epan/dissectors/packet-dcom-cba-acco.c
+++ b/epan/dissectors/packet-dcom-cba-acco.c
@@ -106,8 +106,6 @@ static int hf_cba_getconsconnout = -1;
 static int hf_cba_diagconsconnout = -1;
 static int hf_cba_acco_conn_error_state = -1;
 
-static int hf_cba_acco_server_cb_pointer = -1;
-
 static int hf_cba_acco_info_max = -1;
 static int hf_cba_acco_info_curr = -1;
 
@@ -2017,11 +2015,8 @@ dissect_ICBAAccoMgt2_DiagConsConnections_resp(tvbuff_t *tvb, int offset,
 	guint32 u32Idx;
 	guint32 u32VariableOffset;
 	gchar 	szProv[1000] = { 0 };
-	guint32 u32MaxProvLen = sizeof(szProv);
 	gchar 	szProvItem[1000] = { 0 };
-	guint32 u32MaxProvItemLen = sizeof(szProvItem);
 	gchar 	szConsItem[1000] = { 0 };
-	guint32 u32MaxConsItemLen = sizeof(szConsItem);
 	guint32	u32ConnErrorState;
 
 
@@ -2691,8 +2686,6 @@ static dcerpc_sub_dissector ICBAAccoSync_dissectors[] = {
 void
 proto_register_dcom_cba_acco (void)
 {
-	static gint *ett[1];
-	static gint *ett2[2];
 	static gint *ett3[3];
 	static gint *ett4[4];
 	static gint *ett5[5];
diff --git a/epan/dissectors/packet-dcom-cba.c b/epan/dissectors/packet-dcom-cba.c
index 15cf1bd5c0..4a1e2e29d2 100644
--- a/epan/dissectors/packet-dcom-cba.c
+++ b/epan/dissectors/packet-dcom-cba.c
@@ -1300,10 +1300,6 @@ void
 proto_register_dcom_cba (void)
 {
 	static gint *ett[1];
-	static gint *ett2[2];
-	static gint *ett3[3];
-	static gint *ett4[4];
-	static gint *ett5[5];
 
 	static hf_register_info hf_cba_browse_array[] = {
 		{ &hf_cba_browse_count,
@@ -1510,7 +1506,7 @@ proto_reg_handoff_dcom_cba (void)
 		ICBALogicalDevice_dissectors, hf_cba_opnum);
 
 	dcerpc_init_uuid(proto_ICBALogicalDevice2, ett_ICBALogicalDevice,
-		&uuid_ICBALogicalDevice2, ver_ICBALogicalDevice,
+		&uuid_ICBALogicalDevice2, ver_ICBALogicalDevice2,
 		ICBALogicalDevice_dissectors, hf_cba_opnum);
 
 	dcerpc_init_uuid(proto_ICBAState, ett_ICBAState,
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index a15fb1d154..51f81731aa 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -82,6 +82,8 @@
 #include <netinet/in.h>
 #endif
 
+#include <string.h>
+
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
@@ -787,14 +789,10 @@ dissect_dcom_dcerpc_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 /* XXX: handout data to generic "unkown data" dissector? */
 extern int
 dissect_dcom_tobedone_data(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep, int length)
+	packet_info *pinfo _U_, proto_tree *tree, guint8 *drep _U_, int length)
 {
-/*XXX fixme
-	if (drep);
-	if (pinfo);
-*/
 
-	proto_tree_add_uint(tree, hf_dcom_tobedone_len, tvb, offset, length, length);
+    proto_tree_add_uint(tree, hf_dcom_tobedone_len, tvb, offset, length, length);
 
 	proto_tree_add_bytes(tree, hf_dcom_tobedone, tvb, offset, length, 
 		tvb_get_ptr(tvb, offset, length));
@@ -1519,7 +1517,7 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 /* dissect an STDOBJREF */
 int
 dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex)
+                       proto_tree *tree, guint8 *drep, int hfindex _U_)
 {
 	guint32	u32Flags;
 	guint32	u32PublicRefs;
@@ -1531,8 +1529,6 @@ dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 	guint32	u32SubStart;
 
 
-	if (hfindex);
-
 	/* add subtree header */
 	sub_item = proto_tree_add_item(tree, hf_dcom_stdobjref, tvb, offset, 0, FALSE);
 	sub_tree = proto_item_add_subtree(sub_item, ett_dcom_stdobjref);
@@ -1669,8 +1665,8 @@ dissect_dcom_PMInterfacePointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 
 
 
-void dcom_register_server_coclass(int proto, int ett, e_uuid_t *uuid, guint16 ver, 
-					dcerpc_sub_dissector *sub_dissectors, int opnum_hf) {
+void dcom_register_server_coclass(int proto _U_, int ett _U_, e_uuid_t *uuid _U_, guint16 ver _U_, 
+					dcerpc_sub_dissector *sub_dissectors _U_, int opnum_hf _U_) {
 
 	/* XXX: this must be simply the name registration of the UUID,
 	 * not a whole sub_dissector registration */