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

Remove unused function parameter, rename variable to avoid shadowing. 

svn path=/trunk/; revision=49556
This commit is contained in:
Evan Huus 2013-05-24 17:24:58 +00:00
parent d12fc51afd
commit f953ba8346
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-rmt-common.h
View File

@ -69,7 +69,7 @@ typedef struct fec_data_exchange
/* ============================= */
extern int lct_ext_decode(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint offset, guint offset_max, lct_data_exchange_t *data_exchange,
int hfext, int ettext);
extern void fec_decode_ext_fti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int length, guint8 encoding_id);
extern void fec_decode_ext_fti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 encoding_id);
extern double rmt_decode_send_rate(guint16 send_rate );

2
epan/dissectors/packet-rmt-fec.c
View File

@ -96,7 +96,7 @@ const value_string string_fec_encoding_id[] =
/* ---------- */
/* Decode an EXT_FTI extension and fill FEC array */
void fec_decode_ext_fti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int length, guint8 encoding_id)
void fec_decode_ext_fti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 encoding_id)
{
guint64 transfer_length;
fec_packet_data_t* fec_data;

12
epan/dissectors/packet-rmt-lct.c
View File

@ -223,7 +223,7 @@ int lct_ext_decode(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint of
break;
case 64: /* EXT_FTI */
fec_decode_ext_fti(tvb, pinfo, ext_tree, offset, length,
fec_decode_ext_fti(tvb, pinfo, ext_tree, offset,
(data_exchange == NULL) ? 0 : data_exchange->codepoint);
break;
@ -282,7 +282,7 @@ dissect_lct(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
guint64 tsi;
guint64 toi;
guint16 hlen;
nstime_t time;
nstime_t tmp_time;
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti;
@ -442,15 +442,15 @@ dissect_lct(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* Sender Current Time (SCT) */
if (buffer16 & LCT_SCT_FLAG) {
lct_timestamp_parse(tvb_get_ntohl(tvb, offset), &time);
proto_tree_add_time(lct_tree, hf_sct, tvb, offset, 4, &time);
lct_timestamp_parse(tvb_get_ntohl(tvb, offset), &tmp_time);
proto_tree_add_time(lct_tree, hf_sct, tvb, offset, 4, &tmp_time);
offset += 4;
}
/* Expected Residual Time (ERT) */
if (buffer16 & LCT_ERT_FLAG) {
lct_timestamp_parse(tvb_get_ntohl(tvb, offset), &time);
proto_tree_add_time(lct_tree, hf_ert, tvb, offset, 4, &time);
lct_timestamp_parse(tvb_get_ntohl(tvb, offset), &tmp_time);
proto_tree_add_time(lct_tree, hf_ert, tvb, offset, 4, &tmp_time);
offset += 4;
}