aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rohc.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-10-20 23:35:48 +0000
committerEvan Huus <eapache@gmail.com>2013-10-20 23:35:48 +0000
commit63eac3f6fdd3f98e8b94b58d9f7704eee811fdbb (patch)
tree0555a6aec9cb7840f982c916f8224d874fb96b01 /epan/dissectors/packet-rohc.c
parent98dec2f09b9a0e63ee382c2b357b7165121a5760 (diff)
Fix -Wshadow error
svn path=/trunk/; revision=52726
Diffstat (limited to 'epan/dissectors/packet-rohc.c')
-rw-r--r--epan/dissectors/packet-rohc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index f109c1c21a..8d50ea5697 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -2281,16 +2281,16 @@ start_over:
/* Call IP for uncompressed*/
if (rohc_cid_context->profile==ROHC_PROFILE_UNCOMPRESSED) {
if (rohc_cid_context->large_cid_present) {
- guint8 *data;
+ guint8 *payload_data;
gint len;
get_self_describing_var_len_val(tvb, rohc_tree, offset+1, hf_rohc_large_cid, &val_len);
len = tvb_length_remaining(tvb, offset);
if (len >= val_len) {
len -= val_len;
- data = (guint8 *)wmem_alloc(pinfo->pool, len);
- tvb_memcpy(tvb, data, offset, 1);
- tvb_memcpy(tvb, &data[1], offset+1+val_len, len-1);
- next_tvb = tvb_new_child_real_data(tvb, data, len, len);
+ payload_data = (guint8 *)wmem_alloc(pinfo->pool, len);
+ tvb_memcpy(tvb, payload_data, offset, 1);
+ tvb_memcpy(tvb, &payload_data[1], offset+1+val_len, len-1);
+ next_tvb = tvb_new_child_real_data(tvb, payload_data, len, len);
add_new_data_source(pinfo, next_tvb, "Payload");
}
}