diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-18 16:24:01 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-24 09:51:20 +0000 |
| commit | f9fe43d282c7c3fc035f9bbcbb9ab9846fd5fc54 (patch) | |
| tree | 1bd37a2fe59eb4fe1c440276f5bfe71190a04abf /epan/proto.c | |
| parent | e61189d838cfe7bda65aff2a5e7e2a43aef24827 (diff) | |
| download | wireshark-f9fe43d282c7c3fc035f9bbcbb9ab9846fd5fc54.tar.gz | |
proto: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: Ie8590d6c94b19697cff33874c5bc0b76024d337f
Reviewed-on: https://code.wireshark.org/review/20693
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/proto.c b/epan/proto.c index 8e9c2dc445..5c420416c9 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1810,10 +1810,7 @@ get_time_value(tvbuff_t *tvb, const gint start, const gint length, const guint e #define NTP_BASETIME_ZERO G_GUINT64_CONSTANT(0) tmpsecs = tvb_get_ntohl(tvb, start); - if (tmpsecs) - time_stamp->secs = (time_t)(tmpsecs - (guint32)NTP_BASETIME_ZERO); - else - time_stamp->secs = tmpsecs; /* 0 */ + time_stamp->secs = (time_t)(tmpsecs - (guint32)NTP_BASETIME_ZERO); if (length == 8) { /* |