membuf: add membuf_added and membuf_unadd APIs.

Clean up some whitespace while we're there too.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

ccan/membuf/membuf.c

@@ -23,7 +23,7 @@ size_t membuf_prepare_space_(struct membuf *mb,
 	/* Always reset in the trivial empty case. */
 	if (mb->start == mb->end)
 		mb->start = mb->end = 0;
-	
+
 	if (membuf_num_space_(mb) >= num_extra)
 		return 0;
 

ccan/membuf/membuf.h

@@ -133,6 +133,20 @@ static inline void *membuf_space_(struct membuf *mb, size_t elemsize)
 	return mb->elems + mb->end * elemsize;
 }
 
+/**
+ * membuf_added - declare that we've added this many elements.
+ * @mb: the MEMBUF() declared membuf.
+ * @n: the number of elements we added (must be < membuf_num_space()).
+ */
+#define membuf_added(mb, num)						\
+	membuf_added_(tcon_unwrap(mb), (num))
+
+static inline void membuf_added_(struct membuf *mb, size_t num)
+{
+	assert(num <= membuf_num_space_(mb));
+	mb->end += num;
+}
+
 /**
  * membuf_prepare_space - internal routine to make sure we've got space.
  * @mb: the MEMBUF() declared membuf.
@@ -181,12 +195,25 @@ static inline void *membuf_add_(struct membuf *mb, size_t num, size_t elemsize)
 
 	oldend = membuf_space_(mb, elemsize);
 	/* We assume expandfn succeeded. */
-	assert(num <= membuf_num_space_(mb));
-	mb->end += num;
+	membuf_added_(mb, num);
 
 	return oldend;
 }
 
+/**
+ * membuf_unadd - remove this many added elements.
+ * @mb: the MEMBUF() declared membuf.
+ * @n: the number of elements we want to "unadd" (must be < membuf_num_elems()).
+ */
+#define membuf_unadd(mb, num)						\
+	membuf_unadd_(tcon_unwrap(mb), (num))
+
+static inline void membuf_unadd_(struct membuf *mb, size_t num)
+{
+	assert(num <= membuf_num_elems_(mb));
+	mb->end -= num;
+}
+
 /**
  * membuf_cleanup - reset membuf, return elems array for freeing.
  * @mb: the MEMBUF() declared membuf.

ccan/membuf/test/run.c

@@ -90,7 +90,7 @@ int main(void)
 
 	ok1(membuf_consume(&intbuf, 1));
 	ok1(membuf_num_elems(&intbuf) == 0);
-	
+
 	/* Force it to more-than-double; make sure that works! */
 	memset(membuf_add(&intbuf, 300), 0, 300*sizeof(int));
 	ok1(membuf_num_elems(&intbuf) == 300);