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-ndmp.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-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 3423d6b8fa..1efd88afc9 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -357,7 +357,7 @@ get_ndmp_protocol_version(void) struct ndmp_header { guint32 seq; - guint32 time; + guint32 timestamp; guint32 type; guint32 msg; guint32 rep_seq; @@ -2900,7 +2900,7 @@ dissect_ndmp_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p offset += 4; /* timestamp */ - ns.secs=nh->time; + ns.secs=nh->timestamp; ns.nsecs=0; proto_tree_add_time(tree, hf_ndmp_timestamp, tvb, offset, 4, &ns); offset += 4; @@ -3201,7 +3201,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } nh.seq = tvb_get_ntohl(new_tvb, offset); - nh.time = tvb_get_ntohl(new_tvb, offset+4); + nh.timestamp = tvb_get_ntohl(new_tvb, offset+4); nh.type = tvb_get_ntohl(new_tvb, offset+8); nh.msg = tvb_get_ntohl(new_tvb, offset+12); nh.rep_seq = tvb_get_ntohl(new_tvb, offset+16); |