diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-05-02 18:43:49 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-05-02 20:02:47 +0000 |
| commit | a863ee0c86eed649a57ce9445072e8ff16901144 (patch) | |
| tree | 6f97607eb9a1aaf53b70daa664eab5b724b817a0 /wiretap | |
| parent | ac1c1c3e58532079daff6b807b7e12d5ba17199d (diff) | |
cosine.c: fix compilation with gcc 8
cosine.c:232:46: error: logical ‘or’ of equal expressions [-Werror=logical-op]
Change-Id: Iaefc4ff232b54994c8737a95c5990c0806e7c56e
Reviewed-on: https://code.wireshark.org/review/27270
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/cosine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/cosine.c b/wiretap/cosine.c index 3407ad67d7..d2c2fae9e4 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -229,8 +229,7 @@ static gboolean cosine_check_file_type(wtap *wth, int *err, gchar **err_info) } reclen = strlen(buf); - if (reclen < strlen(COSINE_HDR_MAGIC_STR1) || - reclen < strlen(COSINE_HDR_MAGIC_STR2)) { + if (reclen < MIN(strlen(COSINE_HDR_MAGIC_STR1), strlen(COSINE_HDR_MAGIC_STR2))) { continue; } |