util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Petr Uzel <petr.uzel@suse.cz>
To: util-linux <util-linux@vger.kernel.org>
Subject: [PATCH 3/4] text-utils: use min() from c.h
Date: Thu, 17 May 2012 09:41:08 +0200	[thread overview]
Message-ID: <1337240469-24539-3-git-send-email-petr.uzel@suse.cz> (raw)
In-Reply-To: <1337240469-24539-1-git-send-email-petr.uzel@suse.cz>


Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 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


  parent reply	other threads:[~2012-05-17  7:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17  7:41 [PATCH 1/4] last: use min() from c.h Petr Uzel
2012-05-17  7:41 ` [PATCH 2/4] mkfs.cramfs: remove unused 'MIN' macro definition Petr Uzel
2012-05-23  8:23   ` Karel Zak
2012-05-17  7:41 ` Petr Uzel [this message]
2012-05-23  8:22   ` [PATCH 3/4] text-utils: use min() from c.h Karel Zak
2012-05-17  7:41 ` [PATCH 4/4] libuuid: use max() " Petr Uzel
2012-05-23  8:24   ` Karel Zak
2012-05-23  8:13 ` [PATCH 1/4] last: use min() " Karel Zak
2012-05-23  8:23   ` Petr Uzel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337240469-24539-3-git-send-email-petr.uzel@suse.cz \
    --to=petr.uzel@suse.cz \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).