From: Petr Uzel <petr.uzel@suse.cz>
Date: Thu, 17 May 2012 07:41:08 +0000 (+0200)
Subject: text-utils: use min() from c.h
X-Git-Tag: v2.22-rc1~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbef0769e6bb86cf473ae0cb3635ed760b0032f;p=thirdparty%2Futil-linux.git

text-utils: use min() from c.h

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/text-utils/display.c b/text-utils/display.c
index ad638e7f7b..84ec5d817d 100644
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -41,14 +41,11 @@
 #include <string.h>
 #include "hexdump.h"
 #include "xalloc.h"
+#include "c.h"
 
 static void doskip(const char *, int);
 static u_char *get(void);
 
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
 enum _vflag vflag = FIRST;
 
 static off_t address;			/* address/offset in stream */
@@ -262,7 +259,7 @@ get(void)
 			return(curp);
 		}
 		n = fread((char *)curp + nread, sizeof(unsigned char),
-		    length == -1 ? need : MIN(length, need), stdin);
+		    length == -1 ? need : min(length, need), stdin);
 		if (!n) {
 			if (ferror(stdin))
 				warn("%s", _argv[-1]);