diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-24 10:14:48 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-24 15:16:14 +0000 |
| commit | 8505fb08c1f835fd959872b321de12c13b182583 (patch) | |
| tree | 1c8f17c8290162817785c6064e773ce66014df88 /wiretap | |
| parent | a06042d614eea9418bb625fbe38d89e45defced9 (diff) | |
Fix shadow variable warnings.
Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7
Reviewed-on: https://code.wireshark.org/review/16625
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ngsniffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 3d78c3d57b..5c9d28a37a 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -107,7 +107,7 @@ static const char ngsniffer_magic[] = { struct vers_rec { gint16 maj_vers; /* major version number */ gint16 min_vers; /* minor version number */ - gint16 time; /* DOS-format time */ + gint16 time_dos; /* DOS-format time */ gint16 date; /* DOS-format date */ gint8 type; /* what type of records follow */ guint8 network; /* network type */ @@ -746,7 +746,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) * version-dependent? */ #if 0 - start_time = pletoh16(&version.time); + start_time = pletoh16(&version.time_dos); tm.tm_hour = (start_time&0xf800)>>11; tm.tm_min = (start_time&0x7e0)>>5; tm.tm_sec = (start_time&0x1f)<<1; @@ -2071,7 +2071,7 @@ ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, min_vers = 0; version.maj_vers = GUINT16_TO_LE(maj_vers); version.min_vers = GUINT16_TO_LE(min_vers); - version.time = 0; + version.time_dos = 0; version.date = GUINT16_TO_LE(start_date); version.type = 4; version.network = wtap_encap[wdh->encap]; |