Ethereal-dev: [Ethereal-dev] Warning fixes (unused params)
Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.
From: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Wed, 1 May 2002 01:04:29 +0200
85 unused parameter warnings gone, 499 left. Guy, please consider turning on
all warnings so people working on dissectors see what's left to do (examples
that come to mind are the dcerpc and apf stuff). In case we are not done
by the time the next release is due we can still turn those warnings off
again.
Ciao
Jï¿œrg
--
Joerg Mayer <jmayer@xxxxxxxxx>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.
Changelog: <jmayer@xxxxxxxxx>
- remove unused parameters from some functions, flag others
as unused and leave some warnings in, because they point
to places, that actually need work (i.e. stub functions).
Index: ethereal/packet-clnp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-clnp.c,v
retrieving revision 1.53
diff -u -r1.53 packet-clnp.c
--- packet-clnp.c 2002/04/07 21:54:48 1.53
+++ packet-clnp.c 2002/04/30 22:48:48
@@ -1802,8 +1802,7 @@
*/
/* QUICK HACK Option Len:= PDU_Hd_length-( FixedPart+AddresPart+SegmentPart )*/
- dissect_osi_options( 0xff,
- opt_len,
+ dissect_osi_options( opt_len,
tvb, offset, clnp_tree );
}
Index: ethereal/packet-dcerpc-lsa.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-lsa.c,v
retrieving revision 1.38
diff -u -r1.38 packet-dcerpc-lsa.c
--- packet-dcerpc-lsa.c 2002/04/30 10:17:53 1.38
+++ packet-dcerpc-lsa.c 2002/04/30 22:48:49
@@ -275,7 +275,7 @@
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
hf_lsa_sd_size, &len);
- dissect_nt_sec_desc(tvb, pinfo, offset, tree, len);
+ dissect_nt_sec_desc(tvb, offset, tree, len);
offset += len;
return offset;
Index: ethereal/packet-dcerpc-spoolss.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-spoolss.c,v
retrieving revision 1.22
diff -u -r1.22 packet-dcerpc-spoolss.c
--- packet-dcerpc-spoolss.c 2002/04/30 01:44:34 1.22
+++ packet-dcerpc-spoolss.c 2002/04/30 22:48:50
@@ -940,7 +940,7 @@
offset = prs_uint32(tvb, offset, pinfo, tree, &rel_offset, NULL);
- dissect_nt_sec_desc(tvb, pinfo, struct_start + rel_offset, tree, len);
+ dissect_nt_sec_desc(tvb, struct_start + rel_offset, tree, len);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Attributes");
@@ -974,7 +974,7 @@
{
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags");
- offset = dissect_nt_sec_desc(tvb, pinfo, offset, tree, len);
+ offset = dissect_nt_sec_desc(tvb, offset, tree, len);
return offset;
}
Index: ethereal/packet-esis.c
===================================================================
RCS file: /cvsroot/ethereal/packet-esis.c,v
retrieving revision 1.24
diff -u -r1.24 packet-esis.c
--- packet-esis.c 2002/04/07 22:00:34 1.24
+++ packet-esis.c 2002/04/30 22:48:50
@@ -182,7 +182,7 @@
offset += sal;
len -= ( sal + 1 );
}
- dissect_osi_options( PDU_TYPE_ESIS_ESH, len, tvb, offset, tree );
+ dissect_osi_options( len, tvb, offset, tree );
}
} /* esis_dissect_esh_pdu */ ;
@@ -205,7 +205,7 @@
offset += netl;
len -= ( netl + 1 );
- dissect_osi_options( PDU_TYPE_ESIS_ISH, len, tvb, offset, tree );
+ dissect_osi_options( len, tvb, offset, tree );
}
};
@@ -255,7 +255,7 @@
offset += tmpl;
len -= ( tmpl + 1 );
}
- dissect_osi_options( PDU_TYPE_ESIS_RD, len, tvb, offset, tree );
+ dissect_osi_options( len, tvb, offset, tree );
}
}
Index: ethereal/packet-kerberos.c
===================================================================
RCS file: /cvsroot/ethereal/packet-kerberos.c,v
retrieving revision 1.20
diff -u -r1.20 packet-kerberos.c
--- packet-kerberos.c 2002/01/21 07:36:36 1.20
+++ packet-kerberos.c 2002/04/30 22:48:51
@@ -342,12 +342,12 @@
static int dissect_PrincipalName(char *title, ASN1_SCK *asn1p,
packet_info *pinfo, proto_tree *tree,
int start_offset);
-static int dissect_Ticket(char *title, ASN1_SCK *asn1p, packet_info *pinfo,
+static int dissect_Ticket(ASN1_SCK *asn1p, packet_info *pinfo,
proto_tree *tree, int start_offset);
static int dissect_EncryptedData(char *title, ASN1_SCK *asn1p,
packet_info *pinfo, proto_tree *tree,
int start_offset);
-static int dissect_Addresses(char *title, ASN1_SCK *asn1p, packet_info *pinfo,
+static int dissect_Addresses(ASN1_SCK *asn1p, packet_info *pinfo,
proto_tree *tree, int start_offset);
static const char *
@@ -796,7 +796,7 @@
if (CHECK_CONTEXT_TYPE(KRB5_BODY_ADDRESSES)) {
/* addresses supplied */
- length = dissect_Addresses("Addresses", asn1p, pinfo, kerberos_tree,
+ length = dissect_Addresses(asn1p, pinfo, kerberos_tree,
offset);
if (offset == -1)
return -1;
@@ -827,7 +827,7 @@
end = asn1p->offset + item_len;
while(asn1p->offset < end) {
KRB_DECODE_CONTEXT_HEAD_OR_DIE("ticket", KRB5_KDC_REP_TICKET);
- length = dissect_Ticket("ticket", asn1p, pinfo, additional_tickets_tree,
+ length = dissect_Ticket(asn1p, pinfo, additional_tickets_tree,
offset);
if (length == -1)
return -1;
@@ -869,7 +869,7 @@
offset += item_len;
KRB_DECODE_CONTEXT_HEAD_OR_DIE("ticket", KRB5_KDC_REP_TICKET);
- length = dissect_Ticket("ticket", asn1p, pinfo, kerberos_tree, offset);
+ length = dissect_Ticket(asn1p, pinfo, kerberos_tree, offset);
if (length == -1)
return -1;
offset += length;
@@ -1120,7 +1120,7 @@
}
static int
-dissect_Addresses(char *title, ASN1_SCK *asn1p, packet_info *pinfo,
+dissect_Addresses(ASN1_SCK *asn1p, packet_info *pinfo,
proto_tree *tree, int start_offset) {
proto_tree *address_tree = NULL;
int offset = start_offset;
@@ -1248,7 +1248,7 @@
}
static int
-dissect_Ticket(char *title, ASN1_SCK *asn1p, packet_info *pinfo,
+dissect_Ticket(ASN1_SCK *asn1p, packet_info *pinfo,
proto_tree *tree, int start_offset)
{
/*
Index: ethereal/packet-ldp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ldp.c,v
retrieving revision 1.38
diff -u -r1.38 packet-ldp.c
--- packet-ldp.c 2002/04/29 08:20:08 1.38
+++ packet-ldp.c 2002/04/30 22:48:52
@@ -1045,7 +1045,7 @@
/* Dissect the common hello params */
static void
-dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
+dissect_tlv_common_hello_parms(tvbuff_t *tvb, guint offset, proto_tree *tree)
{
#if 0
proto_tree *ti = NULL;
@@ -1692,7 +1692,7 @@
break;
case TLV_COMMON_HELLO_PARMS:
- dissect_tlv_common_hello_parms(tvb, offset + 4, tlv_tree, length);
+ dissect_tlv_common_hello_parms(tvb, offset + 4, tlv_tree);
break;
case TLV_IPV4_TRANSPORT_ADDRESS:
Index: ethereal/packet-m3ua.c
===================================================================
RCS file: /cvsroot/ethereal/packet-m3ua.c,v
retrieving revision 1.17
diff -u -r1.17 packet-m3ua.c
--- packet-m3ua.c 2002/03/28 21:48:46 1.17
+++ packet-m3ua.c 2002/04/30 22:48:52
@@ -802,7 +802,7 @@
}
static void
-dissect_m3ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_m3ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item)
{
guint16 length, protocol_data_length;
tvbuff_t *payload_tvb;
@@ -1322,7 +1322,7 @@
dissect_m3ua_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case V6_PROTOCOL_DATA_1_PARAMETER_TAG:
- dissect_m3ua_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
+ dissect_m3ua_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_item);
break;
case V6_PROTOCOL_DATA_2_PARAMETER_TAG:
dissect_m3ua_protocol_data_2_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
Index: ethereal/packet-mip.c
===================================================================
RCS file: /cvsroot/ethereal/packet-mip.c,v
retrieving revision 1.29
diff -u -r1.29 packet-mip.c
--- packet-mip.c 2002/04/29 09:57:29 1.29
+++ packet-mip.c 2002/04/30 22:48:53
@@ -166,8 +166,7 @@
};
/* Code to dissect extensions */
static void
-dissect_mip_extensions( tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree)
+dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_item *ti;
proto_tree *exts_tree=NULL;
@@ -379,7 +378,7 @@
if (tree) {
if (tvb_reported_length_remaining(tvb, offset) > 0)
- dissect_mip_extensions(tvb, offset, pinfo, mip_tree);
+ dissect_mip_extensions(tvb, offset, mip_tree);
}
} /* dissect_mip */
Index: ethereal/packet-msproxy.c
===================================================================
RCS file: /cvsroot/ethereal/packet-msproxy.c,v
retrieving revision 1.28
diff -u -r1.28 packet-msproxy.c
--- packet-msproxy.c 2002/04/02 01:28:14 1.28
+++ packet-msproxy.c 2002/04/30 22:48:53
@@ -318,7 +318,7 @@
static int display_application_name(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* display the application name in the proto tree. */
@@ -377,7 +377,7 @@
-static void dissect_user_info_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
+static void dissect_user_info_2(tvbuff_t *tvb, int offset,
proto_tree *tree) {
/* decode the user, application, computer name */
@@ -414,20 +414,20 @@
static void dissect_msproxy_request_1(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* decode the request _1 structure */
offset += 182;
- dissect_user_info_2( tvb, offset, pinfo, tree);
+ dissect_user_info_2( tvb, offset, tree);
}
-static void dissect_bind(tvbuff_t *tvb, int offset, packet_info *pinfo,
+static void dissect_bind(tvbuff_t *tvb, int offset,
proto_tree *tree, hash_entry_t *conv_info) {
/* decode the bind request */
@@ -457,14 +457,14 @@
FALSE);
offset += 82;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
static void dissect_auth(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* decode the authorization request */
@@ -480,7 +480,7 @@
static void dissect_tcp_bind(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, hash_entry_t *conv_info) {
+ proto_tree *tree, hash_entry_t *conv_info) {
/* decode the bind packet. Set the protocol type in the conversation */
/* information so the bind_info can use it to create the payload */
@@ -500,13 +500,13 @@
FALSE);
offset += 96;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
static void dissect_request_connect(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, hash_entry_t *conv_info) {
+ proto_tree *tree, hash_entry_t *conv_info) {
/* decode the connect request, display */
@@ -537,13 +537,12 @@
offset += 84;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
-static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, hash_entry_t *conv_info) {
+static void dissect_bind_info_ack(tvbuff_t *tvb, int offset, proto_tree *tree) {
/* decode the client bind info ack */
@@ -575,13 +574,13 @@
offset, 4, FALSE);
offset += 78;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
static void dissect_request_resolve(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* dissect the request resolve structure */
/* display a string with a length, characters encoding */
@@ -614,7 +613,7 @@
static void dissect_udp_bind(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, hash_entry_t *conv_info) {
+ proto_tree *tree, hash_entry_t *conv_info) {
/* Dissect the udp bind request. Load the protocol id (PT_UDP) and the */
/* remote address so bind_info can use it to create conversation */
@@ -643,12 +642,12 @@
offset += 96;
if ( tree)
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
static void dissect_udp_assoc(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, hash_entry_t *conv_info) {
+ proto_tree *tree, hash_entry_t *conv_info) {
/* dissect the udp associate request. And load client port into */
/* conversation data structure for later. */
@@ -665,11 +664,11 @@
offset += 90;
if ( tree)
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
-static void dissect_msproxy_request(tvbuff_t *tvb, packet_info *pinfo,
+static void dissect_msproxy_request(tvbuff_t *tvb,
proto_tree *tree, hash_entry_t *conv_info) {
int offset = 0;
@@ -714,44 +713,43 @@
switch (cmd){
case MSPROXY_AUTH:
- dissect_auth( tvb, offset, pinfo, tree);
+ dissect_auth( tvb, offset, tree);
break;
case MSPROXY_BIND:
- dissect_bind( tvb, offset, pinfo, tree, conv_info);
+ dissect_bind( tvb, offset, tree, conv_info);
break;
case MSPROXY_UDP_BIND_REQ:
- dissect_udp_bind( tvb, offset, pinfo, tree, conv_info);
+ dissect_udp_bind( tvb, offset, tree, conv_info);
break;
case MSPROXY_AUTH_2: /*$$ this is probably wrong place for this */
case MSPROXY_TCP_BIND:
- dissect_tcp_bind( tvb, offset, pinfo, tree, conv_info);
+ dissect_tcp_bind( tvb, offset, tree, conv_info);
break;
case MSPROXY_RESOLVE:
- dissect_request_resolve( tvb, offset, pinfo, tree);
+ dissect_request_resolve( tvb, offset, tree);
break;
case MSPROXY_CONNECT:
case MSPROXY_LISTEN:
- dissect_request_connect( tvb, offset, pinfo, tree,
+ dissect_request_connect( tvb, offset, tree,
conv_info);
break;
case MSPROXY_BINDINFO_ACK:
- dissect_bind_info_ack( tvb, offset, pinfo, tree,
- conv_info);
+ dissect_bind_info_ack( tvb, offset, tree);
break;
case MSPROXY_HELLO:
case MSPROXY_HELLO_2:
- dissect_msproxy_request_1( tvb, offset, pinfo, tree);
+ dissect_msproxy_request_1( tvb, offset, tree);
break;
case MSPROXY_UDPASSOCIATE:
- dissect_udp_assoc( tvb, offset, pinfo, tree, conv_info);
+ dissect_udp_assoc( tvb, offset, tree, conv_info);
break;
default:
if ( tree)
@@ -762,8 +760,7 @@
-static void dissect_hello_ack(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, hash_entry_t *conv_info) {
+static void dissect_hello_ack(tvbuff_t *tvb, int offset, proto_tree *tree) {
/* decode the hello acknowledge packet */
@@ -783,7 +780,7 @@
static void dissect_user_info_ack(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* decode the response _2 structure */
@@ -796,7 +793,7 @@
static void dissect_udpassociate_ack(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
offset += 6;
@@ -813,13 +810,13 @@
offset, 4, FALSE);
offset += 96;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
-static void dissect_auth_1_ack(tvbuff_t *tvb, int offset, packet_info *pinfo,
+static void dissect_auth_1_ack(tvbuff_t *tvb, int offset,
proto_tree *tree) {
offset += 134;
@@ -837,7 +834,7 @@
static void dissect_msproxy_response_4( tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree) {
+ proto_tree *tree) {
/* decode the response _4 structure */
@@ -874,7 +871,7 @@
offset, 4, FALSE);
offset += 80;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
add_msproxy_conversation( pinfo, conv_info);
@@ -882,8 +879,7 @@
-static void dissect_tcp_bind_ack( tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree) {
+static void dissect_tcp_bind_ack( tvbuff_t *tvb, int offset, proto_tree *tree) {
/* decode the tcp bind */
@@ -907,7 +903,7 @@
offset += 88;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
}
@@ -953,7 +949,7 @@
offset, 4, FALSE);
offset += 78;
- display_application_name( tvb, offset, pinfo, tree);
+ display_application_name( tvb, offset, tree);
}
@@ -962,8 +958,7 @@
-static void dissect_resolve(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree) {
+static void dissect_resolve(tvbuff_t *tvb, int offset, proto_tree *tree) {
/* dissect the response resolve structure */
/* display a string with a length, characters encoding */
@@ -1037,30 +1032,30 @@
switch (cmd) {
case MSPROXY_HELLO_ACK:
- dissect_hello_ack( tvb, offset, pinfo, tree, conv_info);
+ dissect_hello_ack( tvb, offset, tree);
break;
case MSPROXY_USERINFO_ACK:
- dissect_user_info_ack( tvb, offset, pinfo, tree);
+ dissect_user_info_ack( tvb, offset, tree);
break;
case MSPROXY_AUTH_1_ACK:
- dissect_auth_1_ack( tvb, offset, pinfo, tree);
+ dissect_auth_1_ack( tvb, offset, tree);
break;
/* this also handle the MSPROXY_BIND_ACK ??? check this */
case MSPROXY_UDPASSOCIATE_ACK:
- dissect_udpassociate_ack( tvb, offset, pinfo, tree);
+ dissect_udpassociate_ack( tvb, offset, tree);
break;
case MSPROXY_AUTH_2_ACK:
case MSPROXY_AUTH_2_ACK2:
- dissect_msproxy_response_4( tvb, offset, pinfo, tree);
+ dissect_msproxy_response_4( tvb, offset, tree);
break;
case MSPROXY_TCP_BIND_ACK:
- dissect_tcp_bind_ack( tvb, offset, pinfo, tree);
+ dissect_tcp_bind_ack( tvb, offset, tree);
break;
case MSPROXY_CONNECT_ACK:
@@ -1073,7 +1068,7 @@
break;
case MSPROXY_RESOLVE_ACK:
- dissect_resolve( tvb, offset, pinfo, tree);
+ dissect_resolve( tvb, offset, tree);
break;
case MSPROXY_CONNECT_AUTHFAILED:
@@ -1152,7 +1147,7 @@
if ( pinfo->srcport == UDP_PORT_MSPROXY)
dissect_msproxy_response( tvb, pinfo, msproxy_tree, hash_info);
else
- dissect_msproxy_request( tvb, pinfo, msproxy_tree, hash_info);
+ dissect_msproxy_request( tvb, msproxy_tree, hash_info);
}
Index: ethereal/packet-nbns.c
===================================================================
RCS file: /cvsroot/ethereal/packet-nbns.c,v
retrieving revision 1.74
diff -u -r1.74 packet-nbns.c
--- packet-nbns.c 2002/02/28 23:09:03 1.74
+++ packet-nbns.c 2002/04/30 22:48:54
@@ -1350,7 +1350,7 @@
*/
static int
dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, int max_data, int is_cifs)
+ proto_tree *tree, int is_cifs)
{
proto_tree *nbss_tree = NULL;
proto_item *ti = NULL;
@@ -1705,8 +1705,7 @@
}
while (max_data > 0) {
- len = dissect_nbss_packet(tvb, offset, pinfo, tree, max_data,
- is_cifs);
+ len = dissect_nbss_packet(tvb, offset, pinfo, tree, is_cifs);
if (len < 0) {
/*
* We need more data to dissect this, and
Index: ethereal/packet-ncp-int.h
===================================================================
RCS file: /cvsroot/ethereal/packet-ncp-int.h,v
retrieving revision 1.6
diff -u -r1.6 packet-ncp-int.h
--- packet-ncp-int.h 2002/01/10 04:44:34 1.6
+++ packet-ncp-int.h 2002/04/30 22:48:54
@@ -62,10 +62,10 @@
void dissect_ncp_request(tvbuff_t*, packet_info*, guint16,
- guint8, guint16, proto_tree*, proto_tree*);
+ guint8, guint16, proto_tree*);
void dissect_ncp_reply(tvbuff_t *, packet_info*, guint16,
- guint8, proto_tree*, proto_tree*);
+ guint8, proto_tree*);
void ncp_hash_insert(conversation_t *conversation, guint8 nw_sequence,
const ncp_record *ncp_rec);
Index: ethereal/packet-ncp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ncp.c,v
retrieving revision 1.55
diff -u -r1.55 packet-ncp.c
--- packet-ncp.c 2002/01/24 09:20:49 1.55
+++ packet-ncp.c 2002/04/30 22:48:54
@@ -296,12 +296,12 @@
if (header.type == 0x1111 || header.type == 0x2222) {
next_tvb = tvb_new_subset( tvb, hdr_offset, -1, -1 );
dissect_ncp_request(next_tvb, pinfo, nw_connection,
- header.sequence, header.type, ncp_tree, tree);
+ header.sequence, header.type, ncp_tree);
}
else if (header.type == 0x3333) {
next_tvb = tvb_new_subset( tvb, hdr_offset, -1, -1 );
dissect_ncp_reply(next_tvb, pinfo, nw_connection,
- header.sequence, ncp_tree, tree);
+ header.sequence, ncp_tree);
}
else if ( header.type == 0x5555 ||
header.type == 0x7777 ||
Index: ethereal/packet-ncp2222.inc
===================================================================
RCS file: /cvsroot/ethereal/packet-ncp2222.inc,v
retrieving revision 1.9
diff -u -r1.9 packet-ncp2222.inc
--- packet-ncp2222.inc 2002/04/04 03:51:39 1.9
+++ packet-ncp2222.inc 2002/04/30 22:48:54
@@ -164,7 +164,7 @@
void
dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
guint16 nw_connection, guint8 sequence,
- guint16 type, proto_tree *ncp_tree, proto_tree *tree)
+ guint16 type, proto_tree *ncp_tree)
{
guint8 func, subfunc = 0;
gboolean requires_subfunc;
@@ -293,7 +293,7 @@
void
dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
guint16 nw_connection, guint8 sequence,
- proto_tree *ncp_tree, proto_tree *tree) {
+ proto_tree *ncp_tree) {
conversation_t *conversation;
const ncp_record *ncp_rec = NULL;
Index: ethereal/packet-ndmp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ndmp.c,v
retrieving revision 1.18
diff -u -r1.18 packet-ndmp.c
--- packet-ndmp.c 2002/04/29 08:20:09 1.18
+++ packet-ndmp.c 2002/04/30 22:48:55
@@ -427,8 +427,8 @@
static int
-dissect_connect_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_connect_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* version number */
proto_tree_add_item(tree, hf_ndmp_version, tvb, offset, 4, FALSE);
@@ -438,8 +438,8 @@
}
static int
-dissect_error(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
- guint32 seq)
+dissect_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -449,8 +449,8 @@
}
static int
-dissect_ndmp_get_host_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_ndmp_get_host_info_reply(tvbuff_t *tvb, int offset,
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -488,7 +488,8 @@
};
static int
-dissect_ndmp_addr_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_ndmp_addr_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, FALSE);
offset += 4;
@@ -498,7 +499,7 @@
static int
dissect_ndmp_addr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/*address type*/
return dissect_ndmp_addr_type(tvb, offset, pinfo, tree);
@@ -506,7 +507,7 @@
static int
dissect_ndmp_config_get_connection_type_reply(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint32 seq)
+ packet_info *pinfo, proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -529,7 +530,8 @@
{0,NULL}
};
static int
-dissect_auth_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_auth_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, FALSE);
offset += 4;
@@ -539,15 +541,15 @@
static int
dissect_get_auth_type_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* auth type */
return dissect_auth_type(tvb, offset, pinfo, tree);
}
static int
-dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_auth_attr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
guint type;
@@ -572,7 +574,8 @@
}
static int
-dissect_default_env(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_default_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, tree,
@@ -623,7 +626,8 @@
"Normal recover. Do NOT use utf8"
};
static int
-dissect_butype_attrs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_butype_attrs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -678,7 +682,7 @@
static int
dissect_get_butype_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -712,7 +716,8 @@
"Used inode count is VALID"
};
static int
-dissect_fs_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_fs_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -741,7 +746,8 @@
}
static int
-dissect_fs_env(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_fs_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, tree,
@@ -805,7 +811,7 @@
static int
dissect_get_fs_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -827,7 +833,8 @@
"Device does NOT support unload"
};
static int
-dissect_tape_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_tape_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -850,7 +857,8 @@
}
static int
-dissect_tape_capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_tape_capability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
/* name */
offset = dissect_rpc_string(tvb, tree,
@@ -896,7 +904,7 @@
static int
dissect_get_tape_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -925,7 +933,7 @@
static int
dissect_get_scsi_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -940,7 +948,7 @@
static int
dissect_get_server_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -967,8 +975,8 @@
}
static int
-dissect_scsi_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_scsi_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* device */
offset = dissect_rpc_string(tvb, tree,
@@ -978,8 +986,8 @@
}
static int
-dissect_scsi_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_scsi_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1001,8 +1009,8 @@
}
static int
-dissect_scsi_set_state_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_scsi_set_state_request(tvbuff_t *tvb, int offset,
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* device */
offset = dissect_rpc_string(tvb, tree,
@@ -1024,7 +1032,8 @@
}
static int
-dissect_execute_cdb_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_execute_cdb_flags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -1234,8 +1243,8 @@
};
static int
-dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* device */
offset = dissect_rpc_string(tvb, tree,
@@ -1278,7 +1287,8 @@
"Partition is valid"
};
static int
-dissect_tape_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_tape_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -1327,7 +1337,8 @@
"This device does NOT support unload"
};
static int
-dissect_tape_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_tape_flags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -1356,7 +1367,7 @@
static int
dissect_tape_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* invalid bits */
offset=dissect_tape_invalid(tvb, offset, pinfo, tree);
@@ -1418,8 +1429,8 @@
};
static int
-dissect_tape_mtio_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_mtio_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* op */
proto_tree_add_item(tree, hf_ndmp_tape_mtio_op, tvb, offset, 4, FALSE);
@@ -1433,8 +1444,8 @@
}
static int
-dissect_tape_mtio_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_mtio_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1492,7 +1503,8 @@
};
static int
-dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_ndmp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -1540,7 +1552,7 @@
static int
dissect_mover_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1601,8 +1613,8 @@
};
static int
-dissect_mover_listen_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_mover_listen_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* mode */
proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, FALSE);
@@ -1617,7 +1629,7 @@
static int
dissect_mover_listen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1630,8 +1642,8 @@
}
static int
-dissect_mover_set_window_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_mover_set_window_request(tvbuff_t *tvb, int offset,
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* window offset */
proto_tree_add_item(tree, hf_ndmp_window_offset, tvb, offset, 8, FALSE);
@@ -1645,8 +1657,8 @@
}
static int
-dissect_mover_set_record_size_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_mover_set_record_size_request(tvbuff_t *tvb, int offset,
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* record size */
proto_tree_add_item(tree, hf_ndmp_record_size, tvb, offset, 4, FALSE);
@@ -1657,7 +1669,7 @@
static int
dissect_mover_connect_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* mode */
proto_tree_add_item(tree, hf_ndmp_mover_mode, tvb, offset, 4, FALSE);
@@ -1670,8 +1682,8 @@
}
static int
-dissect_log_file_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_log_file_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* file */
offset = dissect_rpc_string(tvb, tree,
@@ -1697,8 +1709,8 @@
};
static int
-dissect_log_message_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_log_message_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* type */
proto_tree_add_item(tree, hf_ndmp_log_type, tvb, offset, 4, FALSE);
@@ -1717,7 +1729,7 @@
static int
dissect_notify_data_halted_request(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint32 seq)
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* halt */
proto_tree_add_item(tree, hf_ndmp_halt, tvb, offset, 4, FALSE);
@@ -1741,8 +1753,8 @@
};
static int
-dissect_notify_connected_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_notify_connected_request(tvbuff_t *tvb, int offset,
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* connected */
proto_tree_add_item(tree, hf_ndmp_connected, tvb, offset, 4, FALSE);
@@ -1762,7 +1774,7 @@
static int
dissect_notify_mover_paused_request(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint32 seq)
+ packet_info *pinfo _U_, proto_tree *tree, guint32 seq _U_)
{
/* mover pause */
proto_tree_add_item(tree, hf_ndmp_mover_pause, tvb, offset, 4, FALSE);
@@ -1776,7 +1788,8 @@
}
static int
-dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_auth_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
guint type;
@@ -1816,14 +1829,14 @@
static int
dissect_connect_client_auth_request(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint32 seq)
+ packet_info *pinfo, proto_tree *tree, guint32 seq _U_)
{
return dissect_auth_data(tvb, offset, pinfo, tree);
}
static int
dissect_connect_server_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1836,8 +1849,8 @@
}
static int
-dissect_tape_write_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_write_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* data */
offset = dissect_rpc_data(tvb, tree, hf_ndmp_data, offset);
@@ -1846,8 +1859,8 @@
}
static int
-dissect_tape_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1861,8 +1874,8 @@
}
static int
-dissect_tape_read_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_read_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* count */
proto_tree_add_item(tree, hf_ndmp_count, tvb, offset, 4, FALSE);
@@ -1872,8 +1885,8 @@
}
static int
-dissect_tape_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+dissect_tape_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -1968,7 +1981,8 @@
"Group is valid"
};
static int
-dissect_file_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_file_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -2119,7 +2133,7 @@
static int
dissect_fh_add_file_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* files */
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -2148,7 +2162,7 @@
static int
dissect_fh_add_dir_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* dirs */
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -2178,7 +2192,7 @@
static int
dissect_fh_add_node_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* node */
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -2189,7 +2203,7 @@
static int
dissect_data_start_backup_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/*butype name*/
offset = dissect_rpc_string(tvb, tree,
@@ -2203,7 +2217,8 @@
}
static int
-dissect_nlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_nlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *tree)
{
/*original path*/
offset = dissect_rpc_string(tvb, tree,
@@ -2235,7 +2250,7 @@
static int
dissect_data_start_recover_request(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree, guint32 seq)
+ packet_info *pinfo, proto_tree *tree, guint32 seq _U_)
{
/* default env */
offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -2254,7 +2269,7 @@
static int
dissect_data_get_env_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
/* error */
proto_tree_add_item(tree, hf_ndmp_error, tvb, offset, 4, FALSE);
@@ -2277,7 +2292,8 @@
"Estimated Time Remaining is valid"
};
static int
-dissect_state_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree)
+dissect_state_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+ proto_tree *parent_tree)
{
proto_item* item = NULL;
proto_tree* tree = NULL;
@@ -2339,7 +2355,7 @@
static int
dissect_data_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, guint32 seq)
+ proto_tree *tree, guint32 seq _U_)
{
nstime_t ns;
Index: ethereal/packet-osi-options.c
===================================================================
RCS file: /cvsroot/ethereal/packet-osi-options.c,v
retrieving revision 1.11
diff -u -r1.11 packet-osi-options.c
--- packet-osi-options.c 2002/04/14 23:04:03 1.11
+++ packet-osi-options.c 2002/04/30 22:48:55
@@ -338,7 +338,6 @@
* main esis tree data and call the sub-protocols as needed.
*
* Input:
- * u_char : PDU type to check if option is allowed or not
* u_char : length of option section
* tvbuff_t * : tvbuff containing packet data
* int : offset into packet where we are (packet_data[offset]== start
@@ -349,7 +348,7 @@
* void, but we will add to the proto_tree if it is not NULL.
*/
void
-dissect_osi_options( u_char pdu_type, u_char opt_len, tvbuff_t *tvb,
+dissect_osi_options( u_char opt_len, tvbuff_t *tvb,
int offset, proto_tree *tree) {
proto_item *ti;
proto_tree *osi_option_tree = NULL;
Index: ethereal/packet-osi-options.h
===================================================================
RCS file: /cvsroot/ethereal/packet-osi-options.h,v
retrieving revision 1.3
diff -u -r1.3 packet-osi-options.h
--- packet-osi-options.h 2002/04/07 21:54:48 1.3
+++ packet-osi-options.h 2002/04/30 22:48:55
@@ -29,7 +29,7 @@
/*
* published API functions
*/
-extern void dissect_osi_options( u_char, u_char, tvbuff_t *, int,
+extern void dissect_osi_options( u_char, tvbuff_t *, int,
proto_tree *);
extern void proto_register_osi_options(void);
Index: ethereal/packet-pppoe.c
===================================================================
RCS file: /cvsroot/ethereal/packet-pppoe.c,v
retrieving revision 1.21
diff -u -r1.21 packet-pppoe.c
--- packet-pppoe.c 2002/01/21 07:36:38 1.21
+++ packet-pppoe.c 2002/04/30 22:48:55
@@ -98,7 +98,7 @@
static void
-dissect_pppoe_tags(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int payload_length) {
+dissect_pppoe_tags(tvbuff_t *tvb, int offset, proto_tree *tree, int payload_length) {
guint16 poe_tag;
guint16 poe_tag_length;
@@ -197,7 +197,7 @@
proto_tree_add_text(pppoe_tree, tvb,4,2,
"Payload Length: %u", pppoe_length);
}
- dissect_pppoe_tags(tvb,6,pinfo,tree,6+pppoe_length);
+ dissect_pppoe_tags(tvb,6,tree,6+pppoe_length);
}
void
Index: ethereal/packet-pptp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-pptp.c,v
retrieving revision 1.23
diff -u -r1.23 packet-pptp.c
--- packet-pptp.c 2002/01/21 07:36:38 1.23
+++ packet-pptp.c 2002/04/30 22:48:56
@@ -302,7 +302,7 @@
}
static void
-dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_cntrl_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 major_ver;
@@ -351,7 +351,7 @@
}
static void
-dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_cntrl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 major_ver;
@@ -408,7 +408,7 @@
}
static void
-dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 reason;
@@ -427,7 +427,7 @@
}
static void
-dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
@@ -448,7 +448,7 @@
}
static void
-dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 4,
@@ -456,7 +456,7 @@
}
static void
-dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_echo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
@@ -481,7 +481,7 @@
}
static void
-dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_out_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 bearer;
@@ -542,7 +542,7 @@
}
static void
-dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_out_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
@@ -587,7 +587,7 @@
}
static void
-dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_in_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 bearer;
@@ -636,7 +636,7 @@
}
static void
-dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_in_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
@@ -673,7 +673,7 @@
}
static void
-dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_in_connected(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint32 frame;
@@ -704,7 +704,7 @@
}
static void
-dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_clear_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
@@ -716,7 +716,7 @@
}
static void
-dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_disc_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
guint8 result;
@@ -751,7 +751,7 @@
}
static void
-dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_error_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
@@ -787,7 +787,7 @@
}
static void
-dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_set_link(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, 2,
Index: ethereal/packet-q2931.c
===================================================================
RCS file: /cvsroot/ethereal/packet-q2931.c,v
retrieving revision 1.23
diff -u -r1.23 packet-q2931.c
--- packet-q2931.c 2002/04/14 23:04:03 1.23
+++ packet-q2931.c 2002/04/30 22:48:56
@@ -251,7 +251,7 @@
};
static void
-dissect_q2931_shift_ie(tvbuff_t *tvb, int offset, int len,
+dissect_q2931_shift_ie(tvbuff_t *tvb, int offset,
proto_tree *tree, guint8 info_element)
{
gboolean non_locking_shift;
@@ -1822,7 +1822,7 @@
case Q2931_IE_BBAND_LOCKING_SHIFT:
case Q2931_IE_BBAND_NLOCKING_SHIFT:
- dissect_q2931_shift_ie(tvb, offset, len, tree, info_element);
+ dissect_q2931_shift_ie(tvb, offset, tree, info_element);
break;
case Q2931_IE_NBAND_BEARER_CAP:
Index: ethereal/packet-sip.c
===================================================================
RCS file: /cvsroot/ethereal/packet-sip.c,v
retrieving revision 1.25
diff -u -r1.25 packet-sip.c
--- packet-sip.c 2002/03/29 01:25:57 1.25
+++ packet-sip.c 2002/04/30 22:48:56
@@ -79,7 +79,7 @@
"SUBSCRIBE"
};
-static gboolean sip_is_request(tvbuff_t *tvb, guint32 offset, gint eol);
+static gboolean sip_is_request(tvbuff_t *tvb, gint eol);
static gboolean sip_is_known_request(tvbuff_t *tvb, guint32 offset);
static gint sip_get_msg_offset(tvbuff_t *tvb, guint32 offset);
@@ -109,7 +109,7 @@
offset = 0;
eol = tvb_find_line_end(tvb, 0, -1, &next_offset);
/* XXX - Check for a valid status message as well. */
- is_request = sip_is_request(tvb, 0, eol);
+ is_request = sip_is_request(tvb, eol);
is_known_request = sip_is_known_request(tvb, 0);
/* XXX - Is this case-sensitive? RFC 2543 didn't explicitly say. */
if (tvb_strneql(tvb, 0, SIP2_HDR, SIP2_HDR_LEN) != 0 && ! is_request)
@@ -199,7 +199,7 @@
* Request-Line = Method SP Request-URI SP SIP-Version CRLF
*/
-static gboolean sip_is_request(tvbuff_t *tvb, guint32 offset, gint eol)
+static gboolean sip_is_request(tvbuff_t *tvb, gint eol)
{
gint meth_len, req_len, req_colon_pos;
guint8 req_start, ver_start, ver_len;
Index: ethereal/packet-smb-common.h
===================================================================
RCS file: /cvsroot/ethereal/packet-smb-common.h,v
retrieving revision 1.10
diff -u -r1.10 packet-smb-common.h
--- packet-smb-common.h 2002/04/30 11:03:08 1.10
+++ packet-smb-common.h 2002/04/30 22:48:56
@@ -62,6 +62,6 @@
int dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name);
int
-dissect_nt_sec_desc(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len);
+dissect_nt_sec_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, int len);
#endif
Index: ethereal/packet-smb.c
===================================================================
RCS file: /cvsroot/ethereal/packet-smb.c,v
retrieving revision 1.254
diff -u -r1.254 packet-smb.c
--- packet-smb.c 2002/04/30 11:03:04 1.254
+++ packet-smb.c 2002/04/30 22:49:02
@@ -735,7 +735,7 @@
static fragment_data *
-smb_trans_defragment(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
+smb_trans_defragment(packet_info *pinfo, tvbuff_t *tvb,
int offset, int count, int pos, int totlen)
{
fragment_data *fd_head=NULL;
@@ -7018,7 +7018,7 @@
Otherwise, we use the offsets to see where the owner SID, group SID,
SACL, and DACL are stored. */
int
-dissect_nt_sec_desc(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len)
+dissect_nt_sec_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, int len)
{
proto_item *item = NULL;
proto_tree *tree = NULL;
@@ -7184,7 +7184,7 @@
case NT_TRANS_CREATE:
/* security descriptor */
if(ntd->sd_len){
- offset = dissect_nt_sec_desc(tvb, pinfo, offset, tree, ntd->sd_len);
+ offset = dissect_nt_sec_desc(tvb, offset, tree, ntd->sd_len);
}
/* extended attributes */
@@ -7201,7 +7201,7 @@
break;
case NT_TRANS_SSD:
- offset = dissect_nt_sec_desc(tvb, pinfo, offset, tree, bc);
+ offset = dissect_nt_sec_desc(tvb, offset, tree, bc);
break;
case NT_TRANS_NOTIFY:
break;
@@ -7643,7 +7643,7 @@
static int
-dissect_nt_trans_data_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd)
+dissect_nt_trans_data_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len)
{
proto_item *item = NULL;
proto_tree *tree = NULL;
@@ -7699,7 +7699,7 @@
* which may be documented in the Win32 documentation
* somewhere.
*/
- offset = dissect_nt_sec_desc(tvb, pinfo, offset, tree, len);
+ offset = dissect_nt_sec_desc(tvb, offset, tree, len);
break;
case NT_TRANS_GET_USER_QUOTA:
bcp=len;
@@ -7714,7 +7714,7 @@
}
static int
-dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd, guint16 bc)
+dissect_nt_trans_param_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len, guint16 bc)
{
proto_item *item = NULL;
proto_tree *tree = NULL;
@@ -7905,7 +7905,7 @@
}
static int
-dissect_nt_trans_setup_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len, nt_trans_data *ntd)
+dissect_nt_trans_setup_response(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, int len)
{
proto_item *item = NULL;
proto_tree *tree = NULL;
@@ -7971,7 +7971,6 @@
guint32 td=0, tp=0;
smb_info_t *si;
smb_nt_transact_info_t *nti;
- static nt_trans_data ntd;
guint16 bc;
int padcnt;
fragment_data *r_fd = NULL;
@@ -8052,7 +8051,7 @@
/* setup data */
if(sc){
- dissect_nt_trans_setup_response(tvb, pinfo, offset, tree, sc*2, &ntd);
+ dissect_nt_trans_setup_response(tvb, pinfo, offset, tree, sc*2);
offset += sc*2;
}
@@ -8072,12 +8071,12 @@
if(smb_trans_reassembly){
/* ...and we were told to do reassembly */
if(pc && ((unsigned int)tvb_length_remaining(tvb, po)>=pc) ){
- r_fd = smb_trans_defragment(tree, pinfo, tvb,
+ r_fd = smb_trans_defragment(pinfo, tvb,
po, pc, pd, td+tp);
}
if((r_fd==NULL) && dc && ((unsigned int)tvb_length_remaining(tvb, od)>=dc) ){
- r_fd = smb_trans_defragment(tree, pinfo, tvb,
+ r_fd = smb_trans_defragment(pinfo, tvb,
od, dc, dd+tp, td+tp);
}
}
@@ -8111,8 +8110,8 @@
if(pd_tvb){
/* we have reassembled data, grab param and data from there */
dissect_nt_trans_param_response(pd_tvb, pinfo, 0, tree, tp,
- &ntd, tvb_length(pd_tvb));
- dissect_nt_trans_data_response(pd_tvb, pinfo, tp, tree, td, &ntd);
+ tvb_length(pd_tvb));
+ dissect_nt_trans_data_response(pd_tvb, pinfo, tp, tree, td);
} else {
/* we do not have reassembled data, just use what we have in the
packet as well as we can */
@@ -8128,7 +8127,7 @@
}
if(pc){
CHECK_BYTE_COUNT(pc);
- dissect_nt_trans_param_response(tvb, pinfo, offset, tree, pc, &ntd, bc);
+ dissect_nt_trans_param_response(tvb, pinfo, offset, tree, pc, bc);
COUNT_BYTES(pc);
}
@@ -8144,7 +8143,7 @@
}
if(dc){
CHECK_BYTE_COUNT(dc);
- dissect_nt_trans_data_response(tvb, pinfo, offset, tree, dc, &ntd);
+ dissect_nt_trans_data_response(tvb, pinfo, offset, tree, dc);
COUNT_BYTES(dc);
}
}
@@ -12024,12 +12023,12 @@
if(smb_trans_reassembly){
/* ...and we were told to do reassembly */
if(pc && (tvb_length_remaining(tvb, po)>=pc) ){
- r_fd = smb_trans_defragment(tree, pinfo, tvb,
+ r_fd = smb_trans_defragment(pinfo, tvb,
po, pc, pd, td+tp);
}
if((r_fd==NULL) && dc && (tvb_length_remaining(tvb, od)>=dc) ){
- r_fd = smb_trans_defragment(tree, pinfo, tvb,
+ r_fd = smb_trans_defragment(pinfo, tvb,
od, dc, dd+tp, td+tp);
}
}
- Prev by Date: Re: [Ethereal-dev] [patch] afp
- Previous by thread: [Ethereal-dev] W32.Elkern removal tools
- Index(es):