[svn] Moved malloc-related code to xmalloc.c. Defined new macros xnew, xnew0,

[wget] / src / rbuf.c

diff --git a/src/rbuf.c b/src/rbuf.c
index 64320454d628d977262cafb30542c3b38206a408..7b11d67fb364ca7bc36d9721f7b8ba863c77719e 100644 (file)
--- a/src/rbuf.c
+++ b/src/rbuf.c
@@ -123,6 +123,8 @@ rbuf_peek (struct rbuf *rbuf, char *store)
   return 1;
 }
 
+#define MIN(p,q) (((p) <= (q)) ? (p) : (q))
+
 /* Flush RBUF's buffer to WHERE.  Flush MAXSIZE bytes at most.
    Returns the number of bytes actually copied.  If the buffer is
    empty, 0 is returned.  */
@@ -133,7 +135,7 @@ rbuf_flush (struct rbuf *rbuf, char *where, int maxsize)
     return 0;
   else
     {
-      int howmuch = MINVAL (rbuf->buffer_left, maxsize);
+      int howmuch = MIN (rbuf->buffer_left, maxsize);
 
       if (where)
        memcpy (where, rbuf->buffer_pos, howmuch);