diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-09-02 22:53:05 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-09-03 06:05:43 +0000 |
| commit | 2be3820912ecee71f0feb5fcc36fdfa53041908d (patch) | |
| tree | 9a0ca48cdbe7f70833ac5fcfb663ac70938e91a5 /epan/dissectors/packet-collectd.c | |
| parent | 32e785f81320342058bbee95f84095cd55449c09 (diff) | |
Address "shadow" warnings found by checkAPI script.
These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise.
Change-Id: I5a2db1549095824530428529e86cab453c031a04
Reviewed-on: https://code.wireshark.org/review/10368
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-collectd.c')
| -rw-r--r-- | epan/dissectors/packet-collectd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 5c6973aabe..65522d2488 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -54,7 +54,7 @@ typedef struct value_data_s { gchar *host; gint host_off; gint host_len; - guint64 time; + guint64 time_value; gint time_off; guint64 interval; gint interval_off; @@ -76,7 +76,7 @@ typedef struct notify_data_s { gchar *host; gint host_off; gint host_len; - guint64 time; + guint64 time_value; gint time_off; guint64 severity; gint severity_off; @@ -311,7 +311,7 @@ collectd_proto_tree_add_assembled_metric (tvbuff_t *tvb, vdispatch->type_instance_len, vdispatch->type_instance); - nstime = collectd_time_to_nstime (vdispatch->time); + nstime = collectd_time_to_nstime (vdispatch->time_value); proto_tree_add_time (subtree, hf_collectd_data_time, tvb, vdispatch->time_off, /* length = */ 8, &nstime); @@ -337,7 +337,7 @@ collectd_proto_tree_add_assembled_notification (tvbuff_t *tvb, ndispatch->host_off, ndispatch->host_len, STR_NONNULL (ndispatch->host)); - nstime = collectd_time_to_nstime (ndispatch->time); + nstime = collectd_time_to_nstime (ndispatch->time_value); proto_tree_add_time (subtree, hf_collectd_data_time, tvb, ndispatch->time_off, /* length = */ 8, &nstime); @@ -1168,7 +1168,7 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_collectd_data_time, offset, &vdispatch.time_off, - &vdispatch.time, + &vdispatch.time_value, collectd_tree, &pi); if (status != 0) pkt_errors++; |