hexdump: fix comparison of distinct pointer types

display.c: In function ‘get’:
display.c:262:117: warning: comparison of distinct pointer types lacks
a cast [enabled by default]

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/display.c b/text-utils/display.c
index 84ec5d817d907e950f35c27a3fd91f8af5b5467f..717565ed154e47eb4b0e5dfd2ff005d0b1d50e16 100644 (file)
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -225,8 +225,7 @@ get(void)
 {
        static int ateof = 1;
        static u_char *curp, *savp;
-       ssize_t n;
-       int need, nread;
+       ssize_t n, need, nread;
        u_char *tmpp;
 
        if (!curp) {

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 6f533590031cde75b58518c54ba483fe45266af8..90c2d775724e2a483a10d50e9499ae0f0e21876b 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -46,7 +46,7 @@
 #include "closestream.h"
 
 FS *fshead;                            /* head of format strings */
-int blocksize;                         /* data block size */
+ssize_t blocksize;                     /* data block size */
 int exitval;                           /* final exit value */
 ssize_t length = -1;                   /* max bytes to read */
 

diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index 622407627f24f9ef812ea8358df70395238c29a7..2222585f8b066577c4ee8ecd90b3a154a8c02c55 100644 (file)
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -72,7 +72,7 @@ typedef struct _fs {                  /* format strings */
 
 extern FU *endfu;
 extern FS *fshead;                     /* head of format strings list */
-extern int blocksize;                  /* data block size */
+extern ssize_t blocksize;              /* data block size */
 extern int deprecated;                 /* od compatibility */
 extern int exitval;                    /* final exit value */
 extern ssize_t length;                 /* max bytes to read */