libdpkg: Rename varbufaddbuf() to varbuf_add_buf()

Make the varbuf API a bit more consistent.

lib/dpkg/buffer.c

@@ -100,7 +100,7 @@ buffer_write(struct buffer_data *data, const void *buf, off_t length)
 
 	switch (data->type) {
 	case BUFFER_WRITE_VBUF:
-		varbufaddbuf((struct varbuf *)data->arg.ptr, buf, length);
+		varbuf_add_buf((struct varbuf *)data->arg.ptr, buf, length);
 		break;
 	case BUFFER_WRITE_FD:
 		ret = fd_write(data->arg.i, buf, length);

lib/dpkg/fields.c

@@ -324,7 +324,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
       }
       depnamelength= p - depnamestart ;
       varbuf_reset(&depname);
-      varbufaddbuf(&depname, depnamestart, depnamelength);
+      varbuf_add_buf(&depname, depnamestart, depnamelength);
       varbuf_add_char(&depname, '\0');
       if (!depname.buf[0])
         parse_error(ps, pigp,
@@ -425,7 +425,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                       _("`%s' field, reference to `%.255s': "
                         "version unterminated"), fip->name, depname.buf);
         varbuf_reset(&version);
-        varbufaddbuf(&version, versionstart, versionlength);
+        varbuf_add_buf(&version, versionstart, versionlength);
         varbuf_add_char(&version, '\0');
         parse_db_version(ps, pigp, &dop->version, version.buf,
                          _("'%s' field, reference to '%.255s': "
@@ -482,7 +482,7 @@ scan_word(const char **valp)
   }
 
   varbuf_reset(&word);
-  varbufaddbuf(&word, start, end - start);
+  varbuf_add_buf(&word, start, end - start);
   varbuf_add_char(&word, '\0');
 
   *valp = p;

lib/dpkg/libdpkg.Versions

@@ -58,7 +58,7 @@ LIBDPKG_PRIVATE {
 	varbuf_add_char;
 	varbuf_dup_char;
 	varbuf_map_char;
-	varbufaddbuf;
+	varbuf_add_buf;
 	varbufprintf;
 	varbufvprintf;
 	varbuf_detach;

lib/dpkg/pkg-format.c

@@ -251,7 +251,7 @@ pkg_format_show(const struct pkg_format_node *head,
 			size_t len = strlen(fb.buf);
 			if ((head->width > 0) && (len > head->width))
 				len = head->width;
-			varbufaddbuf(&vb, fb.buf, len);
+			varbuf_add_buf(&vb, fb.buf, len);
 		}
 
 		varbuf_reset(&fb);

lib/dpkg/test/t-varbuf.c

@@ -118,12 +118,12 @@ test_varbuf_addbuf(void)
 
 	varbuf_init(&vb, 5);
 
-	varbufaddbuf(&vb, "1234567890", 10);
+	varbuf_add_buf(&vb, "1234567890", 10);
 	test_pass(vb.used == 10);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "1234567890", 10);
 
-	varbufaddbuf(&vb, "abcde", 5);
+	varbuf_add_buf(&vb, "abcde", 5);
 	test_pass(vb.used == 15);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "1234567890abcde", 15);
@@ -188,7 +188,7 @@ test_varbuf_map_char(void)
 
 	varbuf_init(&vb, 5);
 
-	varbufaddbuf(&vb, "1234a5678a9012a", 15);
+	varbuf_add_buf(&vb, "1234a5678a9012a", 15);
 
 	varbuf_map_char(&vb, 'a', 'z');
 	test_pass(vb.used == 15);
@@ -232,13 +232,13 @@ test_varbuf_reset(void)
 
 	varbuf_init(&vb, 10);
 
-	varbufaddbuf(&vb, "1234567890", 10);
+	varbuf_add_buf(&vb, "1234567890", 10);
 
 	varbuf_reset(&vb);
 	test_pass(vb.used == 0);
 	test_pass(vb.size >= vb.used);
 
-	varbufaddbuf(&vb, "abcdefghijklmno", 15);
+	varbuf_add_buf(&vb, "abcdefghijklmno", 15);
 	test_pass(vb.used == 15);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "abcdefghijklmno", 15);
@@ -254,7 +254,7 @@ test_varbuf_detach(void)
 
 	varbuf_init(&vb, 0);
 
-	varbufaddbuf(&vb, "1234567890", 10);
+	varbuf_add_buf(&vb, "1234567890", 10);
 
 	str = varbuf_detach(&vb);
 

lib/dpkg/varbuf.c

@@ -91,7 +91,7 @@ varbufvprintf(struct varbuf *v, const char *fmt, va_list args)
 }
 
 void
-varbufaddbuf(struct varbuf *v, const void *s, size_t size)
+varbuf_add_buf(struct varbuf *v, const void *s, size_t size)
 {
   varbuf_grow(v, size);
   memcpy(v->buf + v->used, s, size);

lib/dpkg/varbuf.h

@@ -74,8 +74,8 @@ void varbuf_destroy(struct varbuf *v);
 void varbuf_add_char(struct varbuf *v, int c);
 void varbuf_dup_char(struct varbuf *v, int c, size_t n);
 void varbuf_map_char(struct varbuf *v, int c_src, int c_dst);
-#define varbuf_add_str(v, s) varbufaddbuf(v, s, strlen(s))
-void varbufaddbuf(struct varbuf *v, const void *s, size_t size);
+#define varbuf_add_str(v, s) varbuf_add_buf(v, s, strlen(s))
+void varbuf_add_buf(struct varbuf *v, const void *s, size_t size);
 
 int varbufprintf(struct varbuf *v, const char *fmt, ...) DPKG_ATTR_PRINTF(2);
 int varbufvprintf(struct varbuf *v, const char *fmt, va_list va)

src/archives.c

@@ -389,7 +389,7 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
   } else {
     lastslash= strrchr(fname, '/');
     assert(lastslash);
-    varbufaddbuf(symlinkfn, fname, (lastslash - fname) + 1);
+    varbuf_add_buf(symlinkfn, fname, (lastslash - fname) + 1);
   }
   varbuf_add_str(symlinkfn, ti->linkname);
   varbuf_add_char(symlinkfn, '\0');

src/configure.c

@@ -447,7 +447,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 				      "conffderef readlink relative to '%.*s'",
 				      (int)result->used, result->buf);
 			}
-			varbufaddbuf(result, target.buf, target.used);
+			varbuf_add_buf(result, target.buf, target.used);
 			varbuf_add_char(result, '\0');
 		} else {
 			warning(_("%s: conffile '%.250s' is not a plain file or symlink (= '%s')"),

src/help.c

@@ -116,7 +116,7 @@ void checkpath(void) {
       path_len = path_end ? (size_t)(path_end - path) : strlen(path);
 
       varbuf_reset(&filename);
-      varbufaddbuf(&filename, path, path_len);
+      varbuf_add_buf(&filename, path, path_len);
       if (path_len)
         varbuf_add_char(&filename, '/');
       varbuf_add_str(&filename, *prog);