diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-06-23 17:52:51 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 06:05:51 +0000 |
| commit | 01e22809ffc6797361d1601d1517c8df212c4566 (patch) | |
| tree | 315f3fa81fc998228bcc318444d7fd3d83803131 /epan | |
| parent | 12efbd6b404ff50a5388014ba3d8b543079204f0 (diff) | |
circuit: rename shadow variable
Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a
Reviewed-on: https://code.wireshark.org/review/16105
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/circuit.c | 2 | ||||
| -rw-r--r-- | 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 */ |