libdpkg: Rename varbufvprintf() to varbuf_vprintf()

Make the varbuf API a bit more consistent.

lib/dpkg/buffer.c

@@ -217,7 +217,7 @@ buffer_copy_##name(type1 n1, int typeIn, \
 	off_t ret; \
 \
 	va_start(args, desc); \
-	varbufvprintf(&v, desc, args); \
+	varbuf_vprintf(&v, desc, args); \
 	va_end(args); \
 \
 	ret = buffer_copy(&read_data, &write_data, limit, v.buf); \

lib/dpkg/compress.c

@@ -423,7 +423,7 @@ decompress_filter(struct compressor *compressor, int fd_in, int fd_out,
 		internerr("no compressor specified");
 
 	va_start(args, desc_fmt);
-	varbufvprintf(&desc, desc_fmt, args);
+	varbuf_vprintf(&desc, desc_fmt, args);
 	va_end(args);
 
 	compressor->decompress(fd_in, fd_out, desc.buf);
@@ -442,7 +442,7 @@ compress_filter(struct compressor *compressor, int fd_in, int fd_out,
 		internerr("no compressor specified");
 
 	va_start(args, desc_fmt);
-	varbufvprintf(&desc, desc_fmt, args);
+	varbuf_vprintf(&desc, desc_fmt, args);
 	va_end(args);
 
 	if (compress_level < 0)

lib/dpkg/libdpkg.Versions

@@ -60,7 +60,7 @@ LIBDPKG_PRIVATE {
 	varbuf_map_char;
 	varbuf_add_buf;
 	varbuf_printf;
-	varbufvprintf;
+	varbuf_vprintf;
 	varbuf_detach;
 	varbuf_destroy;
 

lib/dpkg/log.c

@@ -61,7 +61,7 @@ log_message(const char *fmt, ...)
 
 	va_start(args, fmt);
 	varbuf_reset(&log);
-	varbufvprintf(&log, fmt, args);
+	varbuf_vprintf(&log, fmt, args);
 	varbuf_add_char(&log, '\0');
 	va_end(args);
 
@@ -103,7 +103,7 @@ statusfd_send(const char *fmt, ...)
 
 	va_start(args, fmt);
 	varbuf_reset(&vb);
-	varbufvprintf(&vb, fmt, args);
+	varbuf_vprintf(&vb, fmt, args);
 	/* Sanitize string to not include new lines, as front-ends should be
 	 * doing their own word-wrapping. */
 	varbuf_map_char(&vb, '\n', ' ');

lib/dpkg/varbuf.c

@@ -62,14 +62,14 @@ varbuf_printf(struct varbuf *v, const char *fmt, ...)
   va_list args;
 
   va_start(args, fmt);
-  r = varbufvprintf(v, fmt, args);
+  r = varbuf_vprintf(v, fmt, args);
   va_end(args);
 
   return r;
 }
 
 int
-varbufvprintf(struct varbuf *v, const char *fmt, va_list args)
+varbuf_vprintf(struct varbuf *v, const char *fmt, va_list args)
 {
   va_list args_copy;
   int needed, r;

lib/dpkg/varbuf.h

@@ -78,7 +78,7 @@ void varbuf_map_char(struct varbuf *v, int c_src, int c_dst);
 void varbuf_add_buf(struct varbuf *v, const void *s, size_t size);
 
 int varbuf_printf(struct varbuf *v, const char *fmt, ...) DPKG_ATTR_PRINTF(2);
-int varbufvprintf(struct varbuf *v, const char *fmt, va_list va)
+int varbuf_vprintf(struct varbuf *v, const char *fmt, va_list va)
 	DPKG_ATTR_VPRINTF(2);
 
 DPKG_END_DECLS