From: Tobias Klauser <tklauser@distanz.ch>
Date: Sun, 11 Aug 2013 12:21:46 +0000 (+0200)
Subject: pcap_mm: Fix compiler warnings
X-Git-Tag: v0.5.8-rc3~19
X-Git-Url: https://repo.or.cz/w/netsniff-ng.git/commitdiff_plain/b3773742da2d41636c672a838673615a98407746

pcap_mm: Fix compiler warnings

Fix the following compiler warnings that occur when building with "-W
-Wall -Wextra":

pcap_mm.c: In function ‘pcap_mm_read’:
pcap_mm.c:72:73: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
pcap_mm.c:79:72: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---

diff --git a/pcap_mm.c b/pcap_mm.c
index 486fbfe5..0c4114e2 100644
--- a/pcap_mm.c
+++ b/pcap_mm.c
@@ -69,14 +69,14 @@ static ssize_t pcap_mm_read(int fd __maybe_unused, pcap_pkthdr_t *phdr,
 {
 	size_t hdrsize = pcap_get_hdr_length(phdr, type), hdrlen;
 
-	if (unlikely((off_t) (ptr_va_curr + hdrsize - ptr_va_start) > map_size))
+	if (unlikely((off_t) (ptr_va_curr + hdrsize - ptr_va_start) > (off_t) map_size))
 		return -EIO;
 
 	fmemcpy(&phdr->raw, ptr_va_curr, hdrsize);
 	ptr_va_curr += hdrsize;
 	hdrlen = pcap_get_length(phdr, type);
 
-	if (unlikely((off_t) (ptr_va_curr + hdrlen - ptr_va_start) > map_size))
+	if (unlikely((off_t) (ptr_va_curr + hdrlen - ptr_va_start) > (off_t) map_size))
 		return -EIO;
 	if (unlikely(hdrlen == 0 || hdrlen > len))
 		return -EINVAL;