proto: fix this condition has identical branches [-Werror=duplicated-branches] found...
authorAlexis La Goutte <alexis.lagoutte@gmail.com>
Sat, 18 Mar 2017 15:24:01 +0000 (16:24 +0100)
committerMichael Mann <mmann78@netscape.net>
Fri, 24 Mar 2017 09:51:20 +0000 (09:51 +0000)
Change-Id: Ie8590d6c94b19697cff33874c5bc0b76024d337f
Reviewed-on: https://code.wireshark.org/review/20693
Reviewed-by: Michael Mann <mmann78@netscape.net>
epan/proto.c

index 8e9c2dc445f3f4f36eb3749b3858314c2e630865..5c420416c9eda5c1b9d09aded2e338e35dd7f237 100644 (file)
@@ -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) {
                                /*