libdpkg: Rename varbufinit() to varbuf_init()

Make the varbuf API a bit more consistent.

lib/dpkg/dbmodify.c

@@ -257,7 +257,7 @@ modstatdb_init(const char *admindir, enum modstatdb_rw readwritereq)
 
   if (cstatus >= msdbrw_write) {
     createimptmp();
-    varbufinit(&uvb, 10240);
+    varbuf_init(&uvb, 10240);
   }
 
   trig_fixup_awaiters(cstatus);

lib/dpkg/libdpkg.Versions

@@ -51,7 +51,7 @@ LIBDPKG_PRIVATE {
 	str_strip_quotes;
 
 	# Variable buffer support
-	varbufinit;
+	varbuf_init;
 	varbufreset;
 	varbuf_grow;
 	varbuf_trunc;

lib/dpkg/test/t-varbuf.c

@@ -31,7 +31,7 @@ test_varbuf_init(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 0);
+	varbuf_init(&vb, 0);
 	test_pass(vb.used == 0);
 	test_pass(vb.size == 0);
 	test_pass(vb.buf == NULL);
@@ -47,7 +47,7 @@ test_varbuf_prealloc(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 10);
+	varbuf_init(&vb, 10);
 	test_pass(vb.used == 0);
 	test_pass(vb.size >= 10);
 	test_pass(vb.buf != NULL);
@@ -65,7 +65,7 @@ test_varbuf_grow(void)
 	size_t old_size;
 	int i;
 
-	varbufinit(&vb, 10);
+	varbuf_init(&vb, 10);
 
 	/* Test that we grow when needed. */
 	varbuf_grow(&vb, 100);
@@ -96,7 +96,7 @@ test_varbuf_trunc(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 50);
+	varbuf_init(&vb, 50);
 
 	/* Test that we truncate (grow). */
 	varbuf_trunc(&vb, 20);
@@ -116,7 +116,7 @@ test_varbuf_addbuf(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 5);
+	varbuf_init(&vb, 5);
 
 	varbufaddbuf(&vb, "1234567890", 10);
 	test_pass(vb.used == 10);
@@ -136,7 +136,7 @@ test_varbuf_addc(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 1);
+	varbuf_init(&vb, 1);
 
 	varbufaddc(&vb, 'a');
 	test_pass(vb.used == 1);
@@ -166,7 +166,7 @@ test_varbuf_dupc(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 5);
+	varbuf_init(&vb, 5);
 
 	varbufdupc(&vb, 'z', 10);
 	test_pass(vb.used == 10);
@@ -186,7 +186,7 @@ test_varbuf_substc(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 5);
+	varbuf_init(&vb, 5);
 
 	varbufaddbuf(&vb, "1234a5678a9012a", 15);
 
@@ -203,7 +203,7 @@ test_varbuf_printf(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 5);
+	varbuf_init(&vb, 5);
 
 	/* Test normal format printing. */
 	varbufprintf(&vb, "format %s number %d", "string", 10);
@@ -230,7 +230,7 @@ test_varbuf_reset(void)
 {
 	struct varbuf vb;
 
-	varbufinit(&vb, 10);
+	varbuf_init(&vb, 10);
 
 	varbufaddbuf(&vb, "1234567890", 10);
 
@@ -252,7 +252,7 @@ test_varbuf_detach(void)
 	struct varbuf vb;
 	char *str;
 
-	varbufinit(&vb, 0);
+	varbuf_init(&vb, 0);
 
 	varbufaddbuf(&vb, "1234567890", 10);
 

lib/dpkg/varbuf.c

@@ -99,7 +99,7 @@ varbufaddbuf(struct varbuf *v, const void *s, size_t size)
 }
 
 void
-varbufinit(struct varbuf *v, size_t size)
+varbuf_init(struct varbuf *v, size_t size)
 {
   v->used = 0;
   v->size = size;

lib/dpkg/varbuf.h

@@ -30,17 +30,17 @@
 DPKG_BEGIN_DECLS
 
 /*
- * varbufinit must be called exactly once before the use of each varbuf
+ * varbuf_init must be called exactly once before the use of each varbuf
  * (including before any call to varbuf_destroy), or the variable must be
  * initialized with VARBUF_INIT.
  *
  * However, varbufs allocated ‘static’ are properly initialized anyway and
- * do not need varbufinit; multiple consecutive calls to varbufinit before
+ * do not need varbuf_init; multiple consecutive calls to varbuf_init before
  * any use are allowed.
  *
  * varbuf_destroy must be called after a varbuf is finished with, if anything
- * other than varbufinit has been done. After this you are allowed but
- * not required to call varbufinit again if you want to start using the
+ * other than varbuf_init has been done. After this you are allowed but
+ * not required to call varbuf_init again if you want to start using the
  * varbuf again.
  *
  * Callers using C++ need not worry about any of this.
@@ -64,7 +64,7 @@ struct varbuf {
 
 #define VARBUF_INIT { 0, 0, NULL }
 
-void varbufinit(struct varbuf *v, size_t size);
+void varbuf_init(struct varbuf *v, size_t size);
 void varbuf_grow(struct varbuf *v, size_t need_size);
 void varbuf_trunc(struct varbuf *v, size_t used_size);
 char *varbuf_detach(struct varbuf *v);
@@ -87,7 +87,7 @@ DPKG_END_DECLS
 inline
 varbuf::varbuf(size_t _size)
 {
-	varbufinit(this, _size);
+	varbuf_init(this, _size);
 }
 
 inline
@@ -99,7 +99,7 @@ varbuf::~varbuf()
 inline void
 varbuf::init(size_t _size)
 {
-	varbufinit(this, _size);
+	varbuf_init(this, _size);
 }
 
 inline void

src/querycmd.c

@@ -544,7 +544,7 @@ control_path_pkg(struct pkginfo *pkg)
   struct varbuf db_path;
   size_t db_path_len;
 
-  varbufinit(&db_path, 0);
+  varbuf_init(&db_path, 0);
   varbufaddstr(&db_path, pkgadmindir());
   db_path_len = db_path.used;
   varbufaddc(&db_path, '\0');