X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/9b5ac6ff2ef1b71e7ec53c756cad37b1844b9d1e..8f45ff6cb9a269fc6f8f631908f93b4c8123419c:/buf.c

diff --git a/buf.c b/buf.c
index 3dc4996..9594349 100644
--- a/buf.c
+++ b/buf.c
@@ -7,7 +7,7 @@
  * (c) 2001 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -222,7 +222,7 @@ static int findz(buf *b, size_t *nn)
 {
   octet *p;
 
-  if ((p = memchr(BCUR(b), 0, BLEN(b))) == 0) {
+  if ((p = memchr(BCUR(b), 0, BLEFT(b))) == 0) {
     buf_break(b);
     return (-1);
   }
@@ -246,7 +246,7 @@ static int findz(buf *b, size_t *nn)
   void *buf_getmem##w(buf *b, size_t *nn)				\
   {									\
     uint##n sz;								\
-    if (buf_getu##n(b, &sz)) return (0);				\
+    if (buf_getu##w(b, &sz)) return (0);				\
     *nn = sz;								\
     return (buf_get(b, sz));						\
   }
@@ -275,7 +275,7 @@ void *buf_getmemz(buf *b, size_t *nn)
   int buf_putmem##w(buf *b, const void *p, size_t sz)			\
   {									\
     assert(sz <= MASK##W);						\
-    if (buf_putu##n(b, sz) || buf_put(b, p, sz))			\
+    if (buf_putu##w(b, sz) || buf_put(b, p, sz))			\
       return (-1);							\
     return (0);								\
   }