[PATCH 3/4] text-utils: use min() from c.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Petr Uzel <petr.uzel@xxxxxxx>
---
 text-utils/display.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/text-utils/display.c b/text-utils/display.c
index ad638e7..84ec5d8 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]);
-- 
1.7.7

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux