Ethereal-dev: [Ethereal-dev] Some more unused parameter patches
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: Sun, 14 Apr 2002 14:48:39 +0200
Hello,
the attached patch fixes some more unused warnings.
ciao
Jï¿œrg
--
Joerg Mayer <jmayer@xxxxxxxxx>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.
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/14 11:25:23
@@ -503,7 +503,7 @@
};
void
-capture_llap(const u_char *pd, int len, packet_counts *ld)
+capture_llap(const u_char *pd _U_, int len _U_, packet_counts *ld)
{
ld->other++;
}
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/14 11:25:28
@@ -192,7 +192,8 @@
};
void
-capture_ipx(const u_char *pd, int offset, int len, packet_counts *ld)
+capture_ipx(const u_char *pd _U_, int offset _U_, int len _U_,
+ packet_counts *ld)
{
ld->ipx++;
}
Index: ethereal/packet-ranap.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ranap.c,v
retrieving revision 1.11
diff -u -r1.11 packet-ranap.c
--- packet-ranap.c 2002/01/24 09:20:50 1.11
+++ packet-ranap.c 2002/04/14 11:26:49
@@ -3830,7 +3830,7 @@
static int
-dissect_ranap_ie_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *ranap_tree)
+dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree)
{
proto_item *ie_item = NULL;
proto_tree *ie_tree = NULL;
@@ -4084,7 +4084,7 @@
ie_tvb = tvb_new_subset(tvb, offset, -1, -1);
/* dissect the ies */
- dissect_ranap_ie_container(ie_tvb, pinfo, tree, ranap_tree);
+ dissect_ranap_ie_container(ie_tvb, ranap_tree);
}
Index: ethereal/packet-rsvp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-rsvp.c,v
retrieving revision 1.58
diff -u -r1.58 packet-rsvp.c
--- packet-rsvp.c 2002/03/29 00:41:54 1.58
+++ packet-rsvp.c 2002/04/14 11:27:00
@@ -928,7 +928,6 @@
int obj_length;
int mylen;
int offset2;
- char *objtype;
int session_off, tempfilt_off;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
Index: ethereal/packet-rx.c
===================================================================
RCS file: /cvsroot/ethereal/packet-rx.c,v
retrieving revision 1.34
diff -u -r1.34 packet-rx.c
--- packet-rx.c 2002/02/05 21:02:36 1.34
+++ packet-rx.c 2002/04/14 11:27:03
@@ -148,7 +148,7 @@
static dissector_handle_t afs_handle;
static int
-dissect_rx_response_encrypted(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
{
proto_tree *tree;
proto_item *item;
@@ -237,7 +237,7 @@
offset += 4;
/* encrypted : struct */
- offset = dissect_rx_response_encrypted(tvb, pinfo, tree, offset);
+ offset = dissect_rx_response_encrypted(tvb, tree, offset);
/* kvno */
proto_tree_add_item(tree, hf_rx_kvno, tvb, offset, 4, FALSE);
Index: ethereal/packet-sctp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-sctp.c,v
retrieving revision 1.33
diff -u -r1.33 packet-sctp.c
--- packet-sctp.c 2002/03/03 22:42:08 1.33
+++ packet-sctp.c 2002/04/14 11:27:30
@@ -650,7 +650,7 @@
dissect_parameter(tvbuff_t *, packet_info *, proto_tree *);
static void
-dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_tree);
+dissect_error_cause(tvbuff_t *, packet_info *, proto_tree *);
static gboolean
dissect_sctp_chunk(tvbuff_t *, packet_info *, proto_tree *, proto_tree *);
@@ -815,7 +815,7 @@
}
static void
-dissect_ecn_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_ecn_parameter(proto_item *parameter_item)
{
proto_item_set_text(parameter_item, "ECN parameter");
}
@@ -915,7 +915,7 @@
}
static void
-dissect_success_report_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_success_report_parameter(proto_item *parameter_item)
{
proto_item_set_text(parameter_item, "Success report parameter");
}
@@ -1001,7 +1001,7 @@
dissect_supported_address_types_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case ECN_PARAMETER_ID:
- dissect_ecn_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_ecn_parameter(parameter_item);
break;
case UNRELIABLE_STREAMS_PARAMETER_ID:
dissect_unreliable_streams_parameter(parameter_tvb, parameter_tree, parameter_item);
@@ -1019,7 +1019,7 @@
dissect_set_primary_address_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case SUCCESS_REPORT_PARAMETER_ID:
- dissect_success_report_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_success_report_parameter(parameter_item);
break;
case ADAP_LAYER_INDICATION_PARAMETER_ID:
dissect_adap_indication_parameter(parameter_tvb, parameter_tree, parameter_item);
@@ -1094,7 +1094,7 @@
}
static void
-dissect_out_of_resource_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item)
+dissect_out_of_resource_cause(proto_item *cause_item)
{
proto_item_set_text(cause_item, "Error cause reporting lack of resources");
}
@@ -1142,7 +1142,7 @@
}
static void
-dissect_invalid_mandatory_parameter_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item)
+dissect_invalid_mandatory_parameter_cause(proto_item *cause_item)
{
proto_item_set_text(cause_item, "Error cause reporting an invalid mandatory parameter");
}
@@ -1179,7 +1179,7 @@
}
static void
-dissect_cookie_received_while_shutting_down_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item)
+dissect_cookie_received_while_shutting_down_cause(proto_item *cause_item)
{
proto_item_set_text(cause_item, "Error cause reporting cookie reception while shutting down");
}
@@ -1276,7 +1276,7 @@
dissect_stale_cookie_error_cause(cause_tvb, cause_tree, cause_item);
break;
case OUT_OF_RESOURCE:
- dissect_out_of_resource_cause(cause_tvb, cause_tree, cause_item);
+ dissect_out_of_resource_cause(cause_item);
break;
case UNRESOLVABLE_ADDRESS:
dissect_unresolvable_address_cause(cause_tvb, pinfo, cause_tree, cause_item);
@@ -1285,7 +1285,7 @@
dissect_unrecognized_chunk_type_cause(cause_tvb, pinfo, cause_tree, cause_item);
break;
case INVALID_MANDATORY_PARAMETER:
- dissect_invalid_mandatory_parameter_cause(cause_tvb, cause_tree, cause_item);
+ dissect_invalid_mandatory_parameter_cause(cause_item);
break;
case UNRECOGNIZED_PARAMETERS:
dissect_unrecognized_parameters_cause(cause_tvb, pinfo, cause_tree, cause_item);
@@ -1294,7 +1294,7 @@
dissect_no_user_data_cause(cause_tvb, cause_tree, cause_item);
break;
case COOKIE_RECEIVED_WHILE_SHUTTING_DOWN:
- dissect_cookie_received_while_shutting_down_cause(cause_tvb, cause_tree, cause_item);
+ dissect_cookie_received_while_shutting_down_cause(cause_item);
break;
case REQUEST_TO_DELETE_LAST_ADDRESS:
dissect_delete_last_address_cause(cause_tvb, pinfo, cause_tree, cause_item);
@@ -1399,8 +1399,8 @@
}
static void
-dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 initiate_tag, adv_rec_window_credit, initial_tsn;
guint16 number_of_inbound_streams, number_of_outbound_streams;
@@ -1459,15 +1459,15 @@
}
static void
-dissect_init_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_init_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
- dissect_init_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_init_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
}
static void
-dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 cumulative_tsn_ack, adv_rec_window_credit, dup_tsn;
guint16 number_of_gap_blocks, number_of_dup_tsns;
@@ -1544,8 +1544,8 @@
}
static void
-dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
tvbuff_t *parameter_tvb;
guint chunk_length, info_length, padding_length, total_length;
@@ -1567,8 +1567,8 @@
}
static void
-dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
tvbuff_t *parameter_tvb;
guint chunk_length, info_length, padding_length, total_length;
@@ -1591,8 +1591,8 @@
}
static void
-dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint offset, number_of_causes;
guint16 length, padding_length, total_length;
@@ -1622,8 +1622,8 @@
}
static void
-dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 cumulative_tsn_ack;
@@ -1644,8 +1644,8 @@
}
static void
-dissect_shutdown_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_shutdown_ack_chunk(packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, "SHUTDOWN_ACK ");
@@ -1656,8 +1656,8 @@
}
static void
-dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint offset, number_of_causes;
guint16 length, padding_length, total_length;
@@ -1687,8 +1687,8 @@
}
static void
-dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint length, cookie_length, padding_length;
@@ -1714,8 +1714,8 @@
}
static void
-dissect_cookie_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_cookie_ack_chunk(packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, "COOKIE_ACK ");
@@ -1726,8 +1726,8 @@
}
static void
-dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 lowest_tsn;
@@ -1746,8 +1746,8 @@
}
static void
-dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 lowest_tsn;
@@ -1766,7 +1766,7 @@
}
static void
-dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
+dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
{
guint8 flags;
@@ -1792,7 +1792,7 @@
#define FORWARD_TSN_CHUNK_TSN_LENGTH 4
static void
-dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 tsn;
@@ -1822,7 +1822,7 @@
{ 0, NULL } };
static void
-dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 serial_number, correlation_id, ipv4_address;
guint offset, length, padding_length, total_length;
@@ -1877,7 +1877,7 @@
}
static void
-dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item)
{
guint32 serial_number, correlation_id;
guint offset, length, padding_length, total_length;
@@ -1909,8 +1909,8 @@
}
static void
-dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree,
- proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item)
+dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo,
+ proto_tree *chunk_tree, proto_item *chunk_item)
{
guint length, chunk_value_length, padding_length;
guint8 type;
@@ -1979,58 +1979,58 @@
result = dissect_data_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
break;
case SCTP_INIT_CHUNK_ID:
- dissect_init_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_init_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_INIT_ACK_CHUNK_ID:
- dissect_init_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_init_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_SACK_CHUNK_ID:
- dissect_sack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_sack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_HEARTBEAT_CHUNK_ID:
- dissect_heartbeat_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_heartbeat_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_HEARTBEAT_ACK_CHUNK_ID:
- dissect_heartbeat_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_heartbeat_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_ABORT_CHUNK_ID:
- dissect_abort_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_abort_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_SHUTDOWN_CHUNK_ID:
- dissect_shutdown_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_shutdown_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_SHUTDOWN_ACK_CHUNK_ID:
- dissect_shutdown_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_shutdown_ack_chunk(pinfo, chunk_tree, chunk_item);
break;
case SCTP_ERROR_CHUNK_ID:
- dissect_error_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_error_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_COOKIE_ECHO_CHUNK_ID:
- dissect_cookie_echo_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_cookie_echo_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_COOKIE_ACK_CHUNK_ID:
- dissect_cookie_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_cookie_ack_chunk(pinfo, chunk_tree, chunk_item);
break;
case SCTP_ECNE_CHUNK_ID:
- dissect_ecne_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_ecne_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_CWR_CHUNK_ID:
- dissect_cwr_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_cwr_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_SHUTDOWN_COMPLETE_CHUNK_ID:
- dissect_shutdown_complete_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_shutdown_complete_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item, flags_item);
break;
case SCTP_FORWARD_TSN_CHUNK_ID:
- dissect_forward_tsn_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_forward_tsn_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_ASCONF_ACK_CHUNK_ID:
- dissect_asconf_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_asconf_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
case SCTP_ASCONF_CHUNK_ID:
- dissect_asconf_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_asconf_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
default:
- dissect_unknown_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item);
+ dissect_unknown_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item);
break;
};
return result;
Index: ethereal/packet-sdp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-sdp.c,v
retrieving revision 1.29
diff -u -r1.29 packet-sdp.c
--- packet-sdp.c 2002/02/02 23:04:31 1.29
+++ packet-sdp.c 2002/04/14 11:27:33
@@ -128,30 +128,19 @@
/* static functions */
-static void call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int hf, proto_tree* ti);
+static void call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti);
/* Subdissector functions */
-static void dissect_sdp_owner(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti);
-static void dissect_sdp_connection_info(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti);
-static void dissect_sdp_bandwidth(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item *ti);
-static void dissect_sdp_time(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti);
-static void dissect_sdp_repeat_time(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti);
-static void dissect_sdp_timezone(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti);
-static void dissect_sdp_encryption_key(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item * ti);
-static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree,proto_item *ti);
-static void dissect_sdp_media(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item *ti);
-static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree,proto_item *ti);
+static void dissect_sdp_owner(tvbuff_t *tvb, proto_item* ti);
+static void dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti);
+static void dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti);
+static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti);
+static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti);
+static void dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti);
+static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti);
+static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item *ti);
+static void dissect_sdp_media(tvbuff_t *tvb, proto_item *ti);
+static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item *ti);
static void
dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -312,7 +301,7 @@
CLEANUP_CALL_AND_POP;
call_sdp_subdissector(tvb_new_subset(tvb,offset+tokenoffset,
linelen-tokenoffset,-1),
- pinfo,tree,hf,sub_ti);
+ hf,sub_ti);
offset = next_offset;
}
@@ -324,40 +313,35 @@
}
static void
-call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int hf, proto_tree* ti){
+call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti){
if(hf == hf_owner){
- dissect_sdp_owner(tvb,pinfo,tree,ti);
+ dissect_sdp_owner(tvb,ti);
} else if ( hf == hf_connection_info) {
- dissect_sdp_connection_info(tvb,pinfo,tree,ti);
+ dissect_sdp_connection_info(tvb,ti);
} else if ( hf == hf_bandwidth) {
- dissect_sdp_bandwidth(tvb,pinfo,tree,ti);
+ dissect_sdp_bandwidth(tvb,ti);
} else if ( hf == hf_time) {
- dissect_sdp_time(tvb,pinfo,tree,ti);
+ dissect_sdp_time(tvb,ti);
} else if ( hf == hf_repeat_time ){
- dissect_sdp_repeat_time(tvb,pinfo,tree,ti);
+ dissect_sdp_repeat_time(tvb,ti);
} else if ( hf == hf_timezone ) {
- dissect_sdp_timezone(tvb,pinfo,tree,ti);
+ dissect_sdp_timezone(tvb,ti);
} else if ( hf == hf_encryption_key ) {
- dissect_sdp_encryption_key(tvb,pinfo,tree,ti);
+ dissect_sdp_encryption_key(tvb,ti);
} else if ( hf == hf_session_attribute ){
- dissect_sdp_session_attribute(tvb,pinfo,tree,ti);
+ dissect_sdp_session_attribute(tvb,ti);
} else if ( hf == hf_media ) {
- dissect_sdp_media(tvb,pinfo,tree,ti);
+ dissect_sdp_media(tvb,ti);
} else if ( hf == hf_media_attribute ){
- dissect_sdp_media_attribute(tvb,pinfo,tree,ti);
+ dissect_sdp_media_attribute(tvb,ti);
}
}
static void
-dissect_sdp_owner(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
- proto_item *ti){
+dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){
proto_tree *sdp_owner_tree;
gint offset,next_offset,tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -419,14 +403,10 @@
}
static void
-dissect_sdp_connection_info(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti){
+dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){
proto_tree *sdp_connection_info_tree;
gint offset,next_offset,tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -486,14 +466,10 @@
}
static void
-dissect_sdp_bandwidth(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree,proto_item *ti){
+dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){
proto_tree * sdp_bandwidth_tree;
gint offset, next_offset, tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -518,14 +494,10 @@
}
-static void dissect_sdp_time(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti){
+static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){
proto_tree *sdp_time_tree;
gint offset,next_offset, tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -547,14 +519,10 @@
offset, -1, FALSE);
}
-static void dissect_sdp_repeat_time(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti){
+static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){
proto_tree *sdp_repeat_time_tree;
gint offset,next_offset, tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -595,12 +563,9 @@
}
static void
-dissect_sdp_timezone(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item* ti){
+dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){
proto_tree* sdp_timezone_tree;
gint offset, next_offset, tokenlen;
- if(!tree)
- return;
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -630,8 +595,7 @@
}
-static void dissect_sdp_encryption_key(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item * ti){
+static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti){
proto_tree *sdp_encryption_key_tree;
gint offset, next_offset, tokenlen;
@@ -659,8 +623,7 @@
-static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item * ti){
+static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){
proto_tree *sdp_session_attribute_tree;
gint offset, next_offset, tokenlen;
@@ -690,14 +653,10 @@
}
static void
-dissect_sdp_media(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item *ti){
+dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){
proto_tree *sdp_media_tree;
gint offset, next_offset, tokenlen;
- if(!tree)
- return;
-
offset = 0;
next_offset = 0;
tokenlen = 0;
@@ -773,8 +732,7 @@
}
-static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, proto_item * ti){
+static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti){
proto_tree *sdp_media_attribute_tree;
gint offset, next_offset, tokenlen;
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/14 11:27:45
@@ -71,7 +71,8 @@
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(const u_char *pd _U_, int offset _U_, int len _U_,
+ packet_counts *ld)
{
ld->vines++;
}
Index: ethereal/packet-vj.c
===================================================================
RCS file: /cvsroot/ethereal/packet-vj.c,v
retrieving revision 1.6
diff -u -r1.6 packet-vj.c
--- packet-vj.c 2002/02/18 01:08:37 1.6
+++ packet-vj.c 2002/04/14 11:27:48
@@ -350,7 +350,6 @@
tvbuff_t **dst_tvb,
frame_data * fd)
{
- tvbuff_t *orig_tvb = NULL;
vj_header_t *hdr_buf;
guint8 *data_ptr;
guint8 *pbuf = NULL;
@@ -408,8 +407,9 @@
/* Build TCP and IP headers */
hdrlen = lo_nibble(ip->ihl_version) * 4 + TCP_OFFSET(thp) * 4;
- thp->cksum = htons((tvb_get_guint8(src_tvb, offset++) << 8) |
- tvb_get_guint8(src_tvb, offset++));
+ thp->cksum = tvb_get_guint8(src_tvb, offset++) << 8;
+ thp->cksum |= tvb_get_guint8(src_tvb, offset++);
+ thp->cksum = htons(thp->cksum);
if (changes & CHANGE_PUSH_BIT)
thp->flags |= TCP_PUSH_BIT;
else
@@ -578,11 +578,8 @@
frame_data *fd)
{
guint8 ihl = ZERO;
- guint8 index = ZERO;
gint isize = tvb_length(tvb);
guint8 *buffer = NULL;
- tvbuff_t *orig_tvb = NULL;
- gint orig_offset = 0;
g_assert(comp);
g_assert(tvb);
@@ -619,7 +616,6 @@
{
cstate *cs = NULL;
guint8 ihl = ZERO;
- gint isize = tvb_length(tvb);
g_assert(comp);
g_assert(tvb);
- Follow-Ups:
- Re: [Ethereal-dev] Some more unused parameter patches
- From: Joerg Mayer
- Re: [Ethereal-dev] Some more unused parameter patches
- From: Guy Harris
- Re: [Ethereal-dev] Some more unused parameter patches
- Prev by Date: Re: [Ethereal-dev] IEEE 802.11 dissection: auth challenge bug / fragments
- Next by Date: [Ethereal-dev] Some static declarations
- Previous by thread: [Ethereal-dev] FT_STRINGZ and proto_tree_add_string
- Next by thread: Re: [Ethereal-dev] Some more unused parameter patches
- Index(es):