Ethereal-dev: [Ethereal-dev] Unused parameters in capture functions removed

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Tue, 23 Apr 2002 11:32:50 +0200
see subject/changelog
--
Joerg Mayer                                          <jmayer@xxxxxxxxx>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.

Changelog: <jmayer@xxxxxxxxx>
	Removed unused parameters from capture functions.

Index: ethereal/capture.c
===================================================================
RCS file: /cvsroot/ethereal/capture.c,v
retrieving revision 1.172
diff -u -r1.172 capture.c
--- capture.c	2002/04/08 09:09:47	1.172
+++ capture.c	2002/04/23 09:25:22
@@ -1242,7 +1242,7 @@
       capture_chdlc(pd, 0, whdr.caplen, &ld->counts);
       break;
     case WTAP_ENCAP_LOCALTALK:
-      capture_llap(pd, whdr.caplen, &ld->counts);
+      capture_llap(&ld->counts);
       break;
     /* XXX - FreeBSD may append 4-byte ATM pseudo-header to DLT_ATM_RFC1483,
        with LLC header following; we should implement it at some
@@ -2064,7 +2064,7 @@
       capture_clip(pd, phdr->len, &ld->counts);
       break;
     case WTAP_ENCAP_LOCALTALK:
-      capture_llap(pd, phdr->len, &ld->counts);
+      capture_llap(&ld->counts);
       break;
     /* XXX - FreeBSD may append 4-byte ATM pseudo-header to DLT_ATM_RFC1483,
        with LLC header following; we should implement it at some
Index: ethereal/packet-atalk.c
===================================================================
RCS file: /cvsroot/ethereal/packet-atalk.c,v
retrieving revision 1.62
diff -u -r1.62 packet-atalk.c
--- packet-atalk.c	2002/01/21 07:36:32	1.62
+++ packet-atalk.c	2002/04/23 09:25:23
@@ -503,7 +503,7 @@
 };
 
 void
-capture_llap(const u_char *pd, int len, packet_counts *ld)
+capture_llap(packet_counts *ld)
 {
   ld->other++;
 }
Index: ethereal/packet-atalk.h
===================================================================
RCS file: /cvsroot/ethereal/packet-atalk.h,v
retrieving revision 1.7
diff -u -r1.7 packet-atalk.h
--- packet-atalk.h	2001/11/30 07:14:20	1.7
+++ packet-atalk.h	2002/04/23 09:25:23
@@ -48,6 +48,6 @@
  */
 extern gchar *atalk_addr_to_str(const struct atalk_ddp_addr *addrp);
 
-extern void capture_llap(const u_char *pd, int len, packet_counts *ld);
+extern void capture_llap(packet_counts *ld);
 
 #endif
Index: ethereal/packet-eth.c
===================================================================
RCS file: /cvsroot/ethereal/packet-eth.c,v
retrieving revision 1.72
diff -u -r1.72 packet-eth.c
--- packet-eth.c	2002/01/21 07:36:34	1.72
+++ packet-eth.c	2002/04/23 09:25:23
@@ -125,7 +125,7 @@
 
   switch (ethhdr_type) {
     case ETHERNET_802_3:
-      capture_ipx(pd, offset, len, ld);
+      capture_ipx(ld);
       break;
     case ETHERNET_802_2:
       capture_llc(pd, offset, len, ld);
Index: ethereal/packet-ethertype.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ethertype.c,v
retrieving revision 1.27
diff -u -r1.27 packet-ethertype.c
--- packet-ethertype.c	2002/03/23 22:02:20	1.27
+++ packet-ethertype.c	2002/04/23 09:25:24
@@ -111,13 +111,13 @@
       capture_ip(pd, offset, len, ld);
       break;
     case ETHERTYPE_IPX:
-      capture_ipx(pd, offset, len, ld);
+      capture_ipx(ld);
       break;
     case ETHERTYPE_VLAN:
       capture_vlan(pd, offset, len, ld);
       break;
     case ETHERTYPE_VINES:
-      capture_vines(pd, offset, len, ld);
+      capture_vines(ld);
       break;
     default:
       ld->other++;
Index: ethereal/packet-ieee80211.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ieee80211.c,v
retrieving revision 1.59
diff -u -r1.59 packet-ieee80211.c
--- packet-ieee80211.c	2002/04/22 08:14:12	1.59
+++ packet-ieee80211.c	2002/04/23 09:25:24
@@ -451,7 +451,7 @@
         return;
       }
       if (pd[offset+hdr_length] == 0xff && pd[offset+hdr_length+1] == 0xff) {
-        capture_ipx (pd, offset + hdr_length, len, ld);
+        capture_ipx (ld);
       }
       else {
         capture_llc (pd, offset + hdr_length, len, ld);
Index: ethereal/packet-ipx.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ipx.c,v
retrieving revision 1.102
diff -u -r1.102 packet-ipx.c
--- packet-ipx.c	2002/02/17 00:51:19	1.102
+++ packet-ipx.c	2002/04/23 09:25:25
@@ -192,7 +192,7 @@
 };
 
 void
-capture_ipx(const u_char *pd, int offset, int len, packet_counts *ld)
+capture_ipx(packet_counts *ld)
 {
 	ld->ipx++;
 }
Index: ethereal/packet-ipx.h
===================================================================
RCS file: /cvsroot/ethereal/packet-ipx.h,v
retrieving revision 1.15
diff -u -r1.15 packet-ipx.h
--- packet-ipx.h	2001/11/20 21:59:13	1.15
+++ packet-ipx.h	2002/04/23 09:25:25
@@ -144,6 +144,6 @@
 #define IPX_SOCKET_UDP_TUNNEL           0x9092 /* RFC 1791 */
 
 
-void capture_ipx(const u_char *, int, int, packet_counts *);
+void capture_ipx(packet_counts *);
 
 #endif
Index: ethereal/packet-netbios.c
===================================================================
RCS file: /cvsroot/ethereal/packet-netbios.c,v
retrieving revision 1.44
diff -u -r1.44 packet-netbios.c
--- packet-netbios.c	2002/01/21 07:36:37	1.44
+++ packet-netbios.c	2002/04/23 09:25:26
@@ -220,7 +220,7 @@
 };
 
 
-void capture_netbios(const u_char *pd, int offset, int len, packet_counts *ld)
+void capture_netbios(packet_counts *ld)
 {
 	ld->netbios++;
 }
Index: ethereal/packet-netbios.h
===================================================================
RCS file: /cvsroot/ethereal/packet-netbios.h,v
retrieving revision 1.12
diff -u -r1.12 packet-netbios.h
--- packet-netbios.h	2001/11/20 21:59:13	1.12
+++ packet-netbios.h	2002/04/23 09:25:26
@@ -32,7 +32,7 @@
 /* Length of NetBIOS names */
 #define NETBIOS_NAME_LEN	16
 
-void capture_netbios(const u_char *, int, int, packet_counts *);
+void capture_netbios(packet_counts *);
 
 extern int process_netbios_name(const u_char *name_ptr, char *name_ret);
 extern int get_netbios_name(tvbuff_t *tvb, int offset,
Index: ethereal/packet-ppp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ppp.c,v
retrieving revision 1.90
diff -u -r1.90 packet-ppp.c
--- packet-ppp.c	2002/04/14 23:04:03	1.90
+++ packet-ppp.c	2002/04/23 09:25:27
@@ -1354,10 +1354,10 @@
       capture_ip(pd, offset + 4, len, ld);
       break;
     case PPP_IPX:
-      capture_ipx(pd, offset + 4, len, ld);
+      capture_ipx(ld);
       break;
     case PPP_VINES:
-      capture_vines(pd, offset + 4, len, ld);
+      capture_vines(ld);
       break;
     default:
       ld->other++;
Index: ethereal/packet-sll.c
===================================================================
RCS file: /cvsroot/ethereal/packet-sll.c,v
retrieving revision 1.16
diff -u -r1.16 packet-sll.c
--- packet-sll.c	2002/01/21 07:36:42	1.16
+++ packet-sll.c	2002/04/23 09:25:27
@@ -121,7 +121,7 @@
 			 * Novell IPX inside 802.3 with no 802.2 LLC
 			 * header.
 			 */
-			capture_ipx(pd, len, SLL_HEADER_SIZE, ld);
+			capture_ipx(ld);
 			break;
 
 		default:
Index: ethereal/packet-vines.c
===================================================================
RCS file: /cvsroot/ethereal/packet-vines.c,v
retrieving revision 1.39
diff -u -r1.39 packet-vines.c
--- packet-vines.c	2002/01/21 07:36:44	1.39
+++ packet-vines.c	2002/04/23 09:25:27
@@ -71,7 +71,7 @@
 static void dissect_vines(tvbuff_t *, packet_info *, proto_tree *);
 
 void
-capture_vines(const u_char *pd, int offset, int len, packet_counts *ld)
+capture_vines(packet_counts *ld)
 {
 	ld->vines++;
 }
Index: ethereal/packet-vines.h
===================================================================
RCS file: /cvsroot/ethereal/packet-vines.h,v
retrieving revision 1.11
diff -u -r1.11 packet-vines.h
--- packet-vines.h	2002/01/21 07:36:44	1.11
+++ packet-vines.h	2002/04/23 09:25:27
@@ -108,6 +108,6 @@
   guint32 vsmb_ttw;
 } e_vsmb;
 
-void capture_vines(const u_char *, int, int, packet_counts *);
+void capture_vines(packet_counts *);
 
 #endif /* packet-vines.h */
Index: ethereal/packet-vlan.c
===================================================================
RCS file: /cvsroot/ethereal/packet-vlan.c,v
retrieving revision 1.38
diff -u -r1.38 packet-vlan.c
--- packet-vlan.c	2002/01/21 07:36:44	1.38
+++ packet-vlan.c	2002/04/23 09:25:27
@@ -62,7 +62,7 @@
   encap_proto = pntohs( &pd[offset+2] );
   if ( encap_proto <= IEEE_802_3_MAX_LEN) {
     if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) {
-      capture_ipx(pd,offset+4,len,ld);
+      capture_ipx(ld);
     } else {
       capture_llc(pd,offset+4,len,ld);
     }