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

Fix: 

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘dissect_netrom_proto’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:211:9: error: variable ‘dst_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:210:9: error: variable ‘src_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘capture_netrom’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:684:16: error: variable ‘l_pd’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=44224
This commit is contained in:
Jörg Mayer 2012-08-02 19:35:36 +00:00
parent a77257f8a0
commit 33ec97e5c3
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-netrom.c
View File

@ -207,8 +207,8 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
const guint8 *dst_addr;
const guint8 *user_addr;
const guint8 *node_addr;
guint8 src_ssid;
guint8 dst_ssid;
/* guint8 src_ssid;
guint8 dst_ssid; */
guint8 op_code;
guint8 cct_index;
guint8 cct_id;
@ -225,14 +225,14 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
src_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
SET_ADDRESS(&pinfo->dl_src, AT_AX25, AX25_ADDR_LEN, src_addr);
SET_ADDRESS(&pinfo->src, AT_AX25, AX25_ADDR_LEN, src_addr);
src_ssid = *(src_addr + 6);
/* src_ssid = *(src_addr + 6); */
offset += AX25_ADDR_LEN; /* step over src addr */
/* destination */
dst_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
SET_ADDRESS(&pinfo->dl_dst, AT_AX25, AX25_ADDR_LEN, dst_addr);
SET_ADDRESS(&pinfo->dst, AT_AX25, AX25_ADDR_LEN, dst_addr);
dst_ssid = *(dst_addr + 6);
/* dst_ssid = *(dst_addr + 6); */
offset += AX25_ADDR_LEN; /* step over dst addr */
offset += 1; /* step over ttl */
@ -679,15 +679,11 @@ proto_reg_handoff_netrom(void)
}
void
capture_netrom( const guchar *pd, int offset, int len, packet_counts *ld)
capture_netrom( const guchar *pd _U_, int offset, int len, packet_counts *ld)
{
const guchar *l_pd;
if ( ! BYTES_ARE_IN_FRAME( offset, len, NETROM_MIN_SIZE ) )
{
ld->other++;
return;
}
l_pd = pd;
}