From: Karel Zak <kzak@redhat.com>
Date: Wed, 23 May 2012 08:20:19 +0000 (+0200)
Subject: hexdump: fix comparison of distinct pointer types
X-Git-Tag: v2.22-rc1~380
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b0ea094b7cbc4b6e9efa81c8ea01a2dd656317;p=thirdparty%2Futil-linux.git

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 84ec5d817d..717565ed15 100644
--- 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 6f53359003..90c2d77572 100644
--- 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 622407627f..2222585f8b 100644
--- 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 */