diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-19 00:37:39 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-19 00:37:39 +0000 |
| commit | 9b568ea691734185b0a1586ffae0004fc1c786a1 (patch) | |
| tree | 7a28d0a4649f007b3dee96d0d9955ce9cd73410d /epan/dissectors/packet-pop.c | |
| parent | 94b8c6433bdfe96f846e6a2b1b9b12cdbc310905 (diff) | |
Fix gcc -Wshadow warnings
svn path=/trunk/; revision=31561
Diffstat (limited to 'epan/dissectors/packet-pop.c')
| -rw-r--r-- | epan/dissectors/packet-pop.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index 926e68641c..5fcd6dc85c 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -116,7 +116,7 @@ static gboolean response_is_continuation(const guchar *data); static void dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - struct pop_proto_data *frame_data; + struct pop_proto_data *frame_data_p; gboolean is_request; gboolean is_continuation; proto_tree *pop_tree, *reqresp_tree; @@ -153,9 +153,9 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) is_continuation = response_is_continuation(line); } - frame_data = p_get_proto_data(pinfo->fd, proto_pop); + frame_data_p = p_get_proto_data(pinfo->fd, proto_pop); - if (!frame_data) { + if (!frame_data_p) { conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, @@ -208,24 +208,24 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pop_data_desegment) { - if (!frame_data) { + if (!frame_data_p) { data_val->msg_read_len += tvb_length(tvb); - frame_data = se_alloc(sizeof(struct pop_proto_data)); + frame_data_p = se_alloc(sizeof(struct pop_proto_data)); - frame_data->conversation_id = conversation->index; - frame_data->more_frags = data_val->msg_read_len < data_val->msg_tot_len; + frame_data_p->conversation_id = conversation->index; + frame_data_p->more_frags = data_val->msg_read_len < data_val->msg_tot_len; - p_add_proto_data(pinfo->fd, proto_pop, frame_data); + p_add_proto_data(pinfo->fd, proto_pop, frame_data_p); } frag_msg = fragment_add_seq_next(tvb, 0, pinfo, - frame_data->conversation_id, + frame_data_p->conversation_id, pop_data_segment_table, pop_data_reassembled_table, tvb_length(tvb), - frame_data->more_frags); + frame_data_p->more_frags); next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled DATA", |