diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-19 23:51:27 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-19 23:51:27 +0000 |
| commit | 958f60263a5edd0b85e9ae3f09e2b71c177ac199 (patch) | |
| tree | c80e492308a8253f1028a08c173491c431be809b /epan/dissectors/packet-rsync.c | |
| parent | 626d79e3d0a38d0a5f4685c66ce6c29757c1bb11 (diff) | |
Fix a few gcc _Wshadow warnings ....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31580 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rsync.c')
| -rw-r--r-- | epan/dissectors/packet-rsync.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 1432b8c2f5..8d20dec511 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -91,7 +91,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { conversation_t *conversation; struct rsync_conversation_data *conversation_data; - struct rsync_frame_data *frame_data; + struct rsync_frame_data *rsync_frame_data_p; proto_item *ti; proto_tree *rsync_tree; int offset = 0; @@ -127,15 +127,15 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rsync_tree = proto_item_add_subtree(ti, ett_rsync); - frame_data = p_get_proto_data(pinfo->fd, proto_rsync); - if (!frame_data) { + rsync_frame_data_p = p_get_proto_data(pinfo->fd, proto_rsync); + if (!rsync_frame_data_p) { /* then we haven't seen this frame before */ - frame_data = g_malloc(sizeof(struct rsync_frame_data)); - frame_data->state = conversation_data->state; - p_add_proto_data(pinfo->fd, proto_rsync, frame_data); + rsync_frame_data_p = g_malloc(sizeof(struct rsync_frame_data)); + rsync_frame_data_p->state = conversation_data->state; + p_add_proto_data(pinfo->fd, proto_rsync, rsync_frame_data_p); } - switch (frame_data->state) { + switch (rsync_frame_data_p->state) { case RSYNC_INIT: proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE); offset += 8; |