osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Get rid of some unused variables and arguments. 

svn path=/trunk/; revision=5221
This commit is contained in:
Guy Harris 2002-04-22 08:14:12 +00:00
parent 1f1fb86df3
commit d215b73503
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packet-ieee80211.c
View File

@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
* $Id: packet-ieee80211.c,v 1.58 2002/04/17 10:07:56 guy Exp $
* $Id: packet-ieee80211.c,v 1.59 2002/04/22 08:14:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1635,7 +1635,6 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
save_fragmented = pinfo->fragmented;
if (wlan_defragment && (more_frags || frag_number != 0)) {
fragment_data *fd_head;
unsigned char *buf;
/*
* If we've already seen this frame, look it up in the

16
reassemble.c
View File

@ -1,7 +1,7 @@
/* reassemble.c
* Routines for {fragment,segment} reassembly
*
* $Id: reassemble.c,v 1.15 2002/04/17 10:59:58 guy Exp $
* $Id: reassemble.c,v 1.16 2002/04/22 08:14:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -643,7 +643,7 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
*/
static gboolean
fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset,
packet_info *pinfo, guint32 id, guint32 frag_number,
packet_info *pinfo, guint32 frag_number,
guint32 frag_data_len, gboolean more_frags)
{
fragment_data *fd;
@ -831,10 +831,6 @@ fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
{
fragment_key key, *new_key;
fragment_data *fd_head;
fragment_data *fd;
fragment_data *fd_i;
fragment_data *last_fd;
guint32 max, dfpos, size;
/* create key to search hash with */
key.src = pinfo->src;
@ -881,7 +877,7 @@ fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
g_hash_table_insert(fragment_table, new_key, fd_head);
}
if (fragment_add_seq_work(fd_head, tvb, offset, pinfo, id,
if (fragment_add_seq_work(fd_head, tvb, offset, pinfo,
frag_number, frag_data_len, more_frags)) {
/*
* Reassembly is complete.
@ -967,10 +963,6 @@ fragment_add_seq_check(tvbuff_t *tvb, int offset, packet_info *pinfo,
gpointer orig_key, value;
fragment_data *fd_head;
gboolean short_frame;
fragment_data *fd;
fragment_data *fd_i;
fragment_data *last_fd;
guint32 max, dfpos, size;
/*
* Have we already seen this frame?
@ -1060,7 +1052,7 @@ fragment_add_seq_check(tvbuff_t *tvb, int offset, packet_info *pinfo,
return frag_number == 0 ? fd_head : NULL;
}
if (fragment_add_seq_work(fd_head, tvb, offset, pinfo, id,
if (fragment_add_seq_work(fd_head, tvb, offset, pinfo,
frag_number, frag_data_len, more_frags)) {
/*
* Reassembly is complete.