| commit | 8400b186c9f3573d887b88f17955213ad868198c | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Fri Apr 29 10:19:07 2016 -0700 |
| committer | Aurimas Liutikas <aurimas@google.com> | Fri Apr 29 13:09:01 2016 -0700 |
| tree | 12230507791612c504db826375e7f1d87980eb1f | |
| parent | a512e16c8cb9509697a5f983b71987e7e0c91ba3 [diff] |
Clean up version test !(nfhdr->nflog_version) is equivalent to (nfhdr->nflog_version == 0). That will evaluate to 1 if nfhdr->nflog_version is 0 and to 0 otherwise. So !(nfhdr->nflog_version) == 0 is equivalent to nfhdr->nflog_version != 0, but 1) it's more obvious what it means and 2) compilers don't point out that it may not mean what you intended. This is a cherry-pick of upstream commit: https://github.com/the-tcpdump-group/libpcap/commit/f94cd1eb7d0ab32bf1db1dd029acc0c68b054363 Bug: 26936282 Change-Id: Id5433d1dcb8b866f7b358174962add447801c9d8
diff --git a/pcap-common.c b/pcap-common.c index 4db4968..b6f0c97 100644 --- a/pcap-common.c +++ b/pcap-common.c
@@ -1321,7 +1321,7 @@ return; } - if (!(nfhdr->nflog_version) == 0) { + if (nfhdr->nflog_version != 0) { /* Unknown NFLOG version */ return; }