From f8500f39e29b001d609c01f7c265d6458d7f2b15 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Thu, 23 Jun 2016 17:51:41 +0200 Subject: conversation: rename shadow variable Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman --- epan/dissectors/packet-pop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-pop.c') diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index c8978c3162..79b28055bb 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -204,7 +204,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) frame_data_p = wmem_new(wmem_file_scope(), struct pop_proto_data); - frame_data_p->conversation_id = conversation->index; + frame_data_p->conversation_id = conversation->conv_index; frame_data_p->more_frags = data_val->msg_read_len < data_val->msg_tot_len; p_add_proto_data(wmem_file_scope(), pinfo, proto_pop, 0, frame_data_p); -- cgit v1.2.3