pwsafe: Eliminate the `dump' subcommand.

[catacomb-python] / buffer.c

diff --git a/buffer.c b/buffer.c
index af4e1bf2049c51164e1d99d2c6eb8d6111587f90..ea38e658fc0993a3cc2a50a29998b3f784c3ecdf 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
 /* -*-c-*-

- *
- * $Id$

  *
  * Reading and writing buffers of stuff
  *
  *
  * Reading and writing buffers of stuff
  *


@@ -342,7 +340,7 @@ static void ensure(PyObject *me, size_t n)
   if (BLEFT(b) < n) {
     size_t nn = BSZ(b);
     octet *p;
   if (BLEFT(b) < n) {
     size_t nn = BSZ(b);
     octet *p;

-    size_t want = BLEFT(b) + n;
+    size_t want = BLEN(b) + n;

     while (nn < want) nn <<= 1;
     p = xrealloc(BBASE(b), nn, BSZ(b));
     BCUR(b) = p + BLEN(b);
     while (nn < want) nn <<= 1;
     p = xrealloc(BBASE(b), nn, BSZ(b));
     BCUR(b) = p + BLEN(b);


@@ -493,7 +491,7 @@ static PyGetSetDef wbuf_pygetset[] = {
 
 static PyMethodDef wbuf_pymethods[] = {
 #define METHNAME(func) wbmeth_##func
 
 static PyMethodDef wbuf_pymethods[] = {
 #define METHNAME(func) wbmeth_##func

-  METH (zero,                  "WBUF.skip(N)")
+  METH (zero,                  "WBUF.zero(N)")

   METH (put,                   "WBUF.put(BYTES)")
 #define WBMETH_DECL_PUTU_(n, W, w)                                     \
     METH(putu##w, "WBUF.putu" #w "(INT)")
   METH (put,                   "WBUF.put(BYTES)")
 #define WBMETH_DECL_PUTU_(n, W, w)                                     \
     METH(putu##w, "WBUF.putu" #w "(INT)")