From 01e22809ffc6797361d1601d1517c8df212c4566 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Thu, 23 Jun 2016 17:52:51 +0200 Subject: [PATCH] circuit: rename shadow variable Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a Reviewed-on: https://code.wireshark.org/review/16105 Reviewed-by: Anders Broman --- epan/circuit.c | 2 +- epan/circuit.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/circuit.c b/epan/circuit.c index 53b1c9d413..b44e943f73 100644 --- a/epan/circuit.c +++ b/epan/circuit.c @@ -120,7 +120,7 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame) circuit->next = NULL; circuit->first_frame = first_frame; circuit->last_frame = 0; /* not known yet */ - circuit->index = new_index; + circuit->circuit_index = new_index; circuit->data_list = NULL; circuit->dissector_handle = NULL; circuit->key_ptr = new_key; diff --git a/epan/circuit.h b/epan/circuit.h index 7b51875011..0bafce1d78 100644 --- a/epan/circuit.h +++ b/epan/circuit.h @@ -42,7 +42,7 @@ typedef struct circuit { struct circuit *next; /**< pointer to next circuit with given circuit ID */ guint32 first_frame; /**< # of first frame for that circuit */ guint32 last_frame; /**< # of last frame for that circuit */ - guint32 index; /**< unique ID for circuit */ + guint32 circuit_index; /**< unique ID for circuit */ GSList *data_list; /**< list of data associated with circuit */ dissector_handle_t dissector_handle; /**< handle for protocol dissector client associated with circuit */ guint options; /**< wildcard flags */