Wireshark · Ethereal-dev: Re: [Ethereal-dev] Warning fixes (unused params)

[Joerg Mayer <jmayer@xxxxxxxxx>]

This patch removes the "small offenders".

   Jörg

Changelog: <jmayer@xxxxxxxxx>
	- packet-asap.c packet-igmp.c packet-ipv6.c packet-diameter.c
          packet-eigrp.c packet-dvmrp.c:
          Removed unused parameters.

Index: ethereal/packet-asap.c
===================================================================
RCS file: /cvsroot/ethereal/packet-asap.c,v
retrieving revision 1.2
diff -u -r1.2 packet-asap.c
--- packet-asap.c	2002/04/29 08:20:05	1.2
+++ packet-asap.c	2002/05/01 11:41:14
@@ -375,7 +375,7 @@
   { 0,                           NULL } };
 
 static void
-dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *asap_tree)
+dissect_asap_message(tvbuff_t *message_tvb, proto_tree *asap_tree)
 {
   tvbuff_t *parameters_tvb;
   guint8  type, flags;
@@ -423,7 +423,7 @@
     asap_tree = NULL;
   };
   /* dissect the message */
-  dissect_asap_message(message_tvb, pinfo, tree, asap_tree);
+  dissect_asap_message(message_tvb, asap_tree);
 }
 
 /* Register the protocol with Ethereal */
Index: ethereal/packet-igmp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-igmp.c,v
retrieving revision 1.18
diff -u -r1.18 packet-igmp.c
--- packet-igmp.c	2002/02/01 11:01:57	1.18
+++ packet-igmp.c	2002/05/01 11:41:15
@@ -380,7 +380,7 @@
  * IGMP Protocol dissectors
  *************************************************************/
 static int
-dissect_v3_max_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+dissect_v3_max_resp(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
 {
 	proto_tree *tree;
 	proto_item *item;
@@ -413,7 +413,7 @@
 }
 
 static int
-dissect_v3_sqrv_bits(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+dissect_v3_sqrv_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
 {
 	proto_tree *tree;
 	proto_item *item;
@@ -436,7 +436,7 @@
 }
 
 static int
-dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+dissect_v3_group_record(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
 {
 	proto_tree *tree;
 	proto_item *item;
@@ -512,7 +512,7 @@
 	offset += 2;
 	
 	while (num--) {
-		offset = dissect_v3_group_record(tvb,pinfo,tree,offset);
+		offset = dissect_v3_group_record(tvb, tree, offset);
 	}
 
 	return offset;
@@ -527,7 +527,7 @@
 
 	num = tvb_get_ntohs(tvb, offset+9);
 	/* max resp code */
-	offset = dissect_v3_max_resp(tvb, pinfo, tree, offset);
+	offset = dissect_v3_max_resp(tvb, tree, offset);
 
 	/* checksum */
 	igmp_checksum(tree, tvb, hf_checksum, hf_checksum_bad, pinfo, 0);
@@ -538,7 +538,7 @@
 	offset +=4;
 
 	/* bitmask for S and QRV */
-	offset = dissect_v3_sqrv_bits(tvb, pinfo, tree, offset);
+	offset = dissect_v3_sqrv_bits(tvb, tree, offset);
 
 	/* qqic */
 	proto_tree_add_item(tree, hf_qqic, tvb, offset, 1, FALSE);
Index: ethereal/packet-ipv6.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ipv6.c,v
retrieving revision 1.79
diff -u -r1.79 packet-ipv6.c
--- packet-ipv6.c	2002/03/27 04:27:03	1.79
+++ packet-ipv6.c	2002/05/01 11:41:15
@@ -957,7 +957,7 @@
 }
 
 static void
-dissect_ipv6_none(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_ipv6_none(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree _U_)
 {
     if (hf_ipv6_mipv6_length != -1) {
 	if (check_col(pinfo->cinfo, COL_INFO))
Index: ethereal/packet-diameter.c
===================================================================
RCS file: /cvsroot/ethereal/packet-diameter.c,v
retrieving revision 1.46
diff -u -r1.46 packet-diameter.c
--- packet-diameter.c	2002/04/29 08:20:07	1.46
+++ packet-diameter.c	2002/05/01 11:41:16
@@ -370,7 +370,7 @@
  * add them too.
  */
 static int
-xmlParseAVP(xmlDocPtr doc, xmlNodePtr cur)
+xmlParseAVP(xmlNodePtr cur)
 {
   char *name=NULL, *description=NULL, *code=NULL, *mayEncrypt=NULL,
 	*mandatory=NULL, *protected=NULL, *vendorBit=NULL, *vendorName = NULL,
@@ -508,7 +508,7 @@
  * list of commands.
  */
 static int
-xmlParseCommand(xmlDocPtr doc, xmlNodePtr cur)
+xmlParseCommand(xmlNodePtr cur)
 {
   char *name, *code, *vendorIdString;
 
@@ -585,7 +585,7 @@
  * This routine will pars in a XML vendor entry.
  */
 static int
-xmlParseVendor(xmlDocPtr doc, xmlNodePtr cur)
+xmlParseVendor(xmlNodePtr cur)
 {
   char *name=NULL, *code=NULL, *id=NULL;
 
@@ -606,7 +606,7 @@
  * This routine will either parse in the base protocol, or an application.
  */
 static int
-xmlDictionaryParseSegment(xmlDocPtr doc, xmlNodePtr cur, int base)
+xmlDictionaryParseSegment(xmlNodePtr cur, int base)
 {
   if (!base) {
 	char *name;
@@ -638,14 +638,14 @@
   while (cur != NULL) {
 	if (!strcasecmp((char *)cur->name, "avp")) {
 	  /* we have an avp!!! */
-	  xmlParseAVP(doc, cur);
+	  xmlParseAVP(cur);
 	} else if (!strcasecmp((char *)cur->name, "vendor")) {
 	  /* we have a vendor */
-	  xmlParseVendor(doc, cur);
+	  xmlParseVendor(cur);
 	  /* For now, ignore typedefn and text */
 	} else if (!strcasecmp((char *)cur->name, "command")) {
 	  /* Found a command */
-	  xmlParseCommand(doc,cur);
+	  xmlParseCommand(cur);
 	} else if (!strcasecmp((char *)cur->name, "text")) {
 	} else if (!strcasecmp((char *)cur->name, "comment")) {
 	} else if (!strcasecmp((char *)cur->name, "typedefn")) {
@@ -666,16 +666,16 @@
  * dictionary that has been parsed by libxml.
  */
 static int
-xmlDictionaryParse(xmlDocPtr doc, xmlNodePtr cur)
+xmlDictionaryParse(xmlNodePtr cur)
 {
   /* We should expect a base protocol, followed by multiple applicaitons */
   while (cur != NULL) {
 	if (!strcasecmp((char *)cur->name, "base")) {
 	  /* Base protocol.  Descend and parse */
-	  xmlDictionaryParseSegment(doc, cur, 1);
+	  xmlDictionaryParseSegment(cur, 1);
 	} else if (!strcasecmp((char *)cur->name, "application")) {
 	  /* Application.  Descend and parse */
-	  xmlDictionaryParseSegment(doc, cur, 0);
+	  xmlDictionaryParseSegment(cur, 0);
 	} else if (!strcasecmp((char *)cur->name, "text")) {
 	  /* Ignore text */
 	} else {
@@ -734,7 +734,7 @@
    * Ok, the dictionary has been parsed by libxml, and is valid.
    * All we have to do now is read in our information.
    */
-  if (xmlDictionaryParse(doc, cur->xmlChildrenNode) != 0) {
+  if (xmlDictionaryParse(cur->xmlChildrenNode) != 0) {
 	/* Error has already been printed */
 	return -1;
   }
Index: ethereal/packet-eigrp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-eigrp.c,v
retrieving revision 1.22
diff -u -r1.22 packet-eigrp.c
--- packet-eigrp.c	2002/02/01 04:34:15	1.22
+++ packet-eigrp.c	2002/05/01 11:41:16
@@ -123,8 +123,8 @@
 };
 
 
-static void dissect_eigrp_par (tvbuff_t *tvb, proto_tree *tree, proto_item *ti);
-static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree, proto_item *ti);
+static void dissect_eigrp_par (tvbuff_t *tvb, proto_tree *tree);
+static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree);
 static void dissect_eigrp_sv  (tvbuff_t *tvb, proto_tree *tree, proto_item *ti);
 static void dissect_eigrp_nms (tvbuff_t *tvb, proto_tree *tree, proto_item *ti);
 
@@ -205,10 +205,10 @@
                      
 	     switch (tlv){
 	     	case TLV_PAR:
-	     		dissect_eigrp_par(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti);
+	     		dissect_eigrp_par(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree);
 	     		break;
 	     	case TLV_SEQ:
-	     		dissect_eigrp_seq(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti);
+	     		dissect_eigrp_seq(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree);
 	     		break;
 	     	case TLV_SV:
 	     		dissect_eigrp_sv(tvb_new_subset(tvb, offset+4, size-4, -1), tlv_tree, ti);
@@ -253,7 +253,7 @@
 
 
 
-static void dissect_eigrp_par (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)	{
+static void dissect_eigrp_par (tvbuff_t *tvb, proto_tree *tree)	{
 	proto_tree_add_text (tree,tvb,0,1,"K1 = %u",tvb_get_guint8(tvb,0));
 	proto_tree_add_text (tree,tvb,1,1,"K2 = %u",tvb_get_guint8(tvb,1));
 	proto_tree_add_text (tree,tvb,2,1,"K3 = %u",tvb_get_guint8(tvb,2));
@@ -263,7 +263,7 @@
 	proto_tree_add_text (tree,tvb,6,2,"Hold Time = %u",tvb_get_ntohs(tvb,6));
 }
 
-static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)
+static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree)
 {	guint8 addr_len;
 	addr_len=tvb_get_guint8(tvb,0);
         proto_tree_add_text (tree,tvb,0,1,"Address length = %u",addr_len);
Index: ethereal/packet-dvmrp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dvmrp.c,v
retrieving revision 1.9
diff -u -r1.9 packet-dvmrp.c
--- packet-dvmrp.c	2002/04/02 05:12:12	1.9
+++ packet-dvmrp.c	2002/05/01 11:41:16
@@ -222,7 +222,7 @@
 };
 
 int
-dissect_v3_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
 {
 	guint8 m0,m1,m2,m3;
 	guint8 s0,s1,s2,s3;
@@ -376,7 +376,7 @@
 		}
 		break;
 	case DVMRP_V3_REPORT:
-		offset = dissect_v3_report(tvb, pinfo, parent_tree, offset);
+		offset = dissect_v3_report(tvb, parent_tree, offset);
 		break;
 	case DVMRP_V3_PRUNE:
 		/* source address */