dumpcap.c: cap_pipe_read() returns a ssize_t whatever the platform (CID 1424899)

Change-Id: I9c157e1ed7264d787c26ca60bbbe32edfc99bff8
Reviewed-on: https://code.wireshark.org/review/24706
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/dumpcap.c b/dumpcap.c
index 458e576e5ca74c44143f7c25fd2602e862b14b59..19287b9fe7a5ce6ab3ab1233bc4732a503cdc79b 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -1284,11 +1284,11 @@ static void *cap_thread_read(void *arg)
     capture_src *pcap_src;
 #ifdef _WIN32
     BOOL res;
-    DWORD b, last_err, bytes_read;
+    DWORD last_err, bytes_read;
 #else /* _WIN32 */
     size_t bytes_read;
-    int b;
 #endif /* _WIN32 */
+    ssize_t b;
 
     pcap_src = (capture_src *)arg;
     while (pcap_src->cap_pipe_err == PIPOK) {
@@ -1481,10 +1481,12 @@ cap_pipe_read_data_bytes(capture_src *pcap_src, char *errmsg, int errmsgl)
     int sel_ret;
     int fd = pcap_src->cap_pipe_fd;
 #ifdef _WIN32
-    DWORD b, sz, bytes_read = 0;
+    DWORD sz, bytes_read = 0;
 #else /* _WIN32 */
-    size_t b, sz, bytes_read = 0;
+    size_t sz, bytes_read = 0;
 #endif /* _WIN32 */
+    ssize_t b;
+
     sz = pcap_src->cap_pipe_bytes_to_read - pcap_src->cap_pipe_bytes_read;
     while (bytes_read < sz) {
         if (fd == -1) {