diff options
| author | Petr Uzel | 2012-05-17 09:41:08 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-05-23 09:56:51 +0200 |
| commit | 3bbef0769e6bb86cf473ae0cb3635ed760b0032f (patch) | |
| tree | f4a1dd4900da36213fb8632aa64d24bc6917968e /text-utils/display.c | |
| parent | mkfs.cramfs: remove unused 'MIN' macro definition (diff) | |
| download | kernel-qcow2-util-linux-3bbef0769e6bb86cf473ae0cb3635ed760b0032f.tar.gz kernel-qcow2-util-linux-3bbef0769e6bb86cf473ae0cb3635ed760b0032f.tar.xz kernel-qcow2-util-linux-3bbef0769e6bb86cf473ae0cb3635ed760b0032f.zip | |
text-utils: use min() from c.h
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'text-utils/display.c')
| -rw-r--r-- | 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 ad638e7f7..84ec5d817 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]); |