osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2017-03-18 16:24:01 +01:00 committed by Michael Mann
parent e61189d838
commit f9fe43d282
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/proto.c
View 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) {
/*