libdpkg: Rename varbufprintf() to varbuf_printf()

Make the varbuf API a bit more consistent.

dpkg-deb/build.c

@@ -103,7 +103,7 @@ file_info_get(const char *root, int fd)
   size_t root_len;
 
   varbuf_reset(&fn);
-  root_len = varbufprintf(&fn, "%s/", root);
+  root_len = varbuf_printf(&fn, "%s/", root);
 
   while (1) {
     int	res;
@@ -182,7 +182,7 @@ check_file_perms(const char *dir)
   const char *const *mscriptp;
   struct stat mscriptstab;
 
-  varbufprintf(&path, "%s/%s/", dir, BUILDCONTROLDIR);
+  varbuf_printf(&path, "%s/%s/", dir, BUILDCONTROLDIR);
   if (lstat(path.buf, &mscriptstab))
     ohshite(_("unable to stat control directory"));
   if (!S_ISDIR(mscriptstab.st_mode))
@@ -194,7 +194,7 @@ check_file_perms(const char *dir)
 
   for (mscriptp = maintainerscripts; *mscriptp; mscriptp++) {
     varbuf_reset(&path);
-    varbufprintf(&path, "%s/%s/%s", dir, BUILDCONTROLDIR, *mscriptp);
+    varbuf_printf(&path, "%s/%s/%s", dir, BUILDCONTROLDIR, *mscriptp);
     if (!lstat(path.buf, &mscriptstab)) {
       if (S_ISLNK(mscriptstab.st_mode))
         continue;
@@ -225,7 +225,7 @@ check_conffiles(const char *dir)
   struct file_info *conffiles_head = NULL;
   struct file_info *conffiles_tail = NULL;
 
-  varbufprintf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONFFILESFILE);
+  varbuf_printf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONFFILESFILE);
 
   cf = fopen(controlfile.buf, "r");
   if (cf == NULL) {
@@ -255,7 +255,7 @@ check_conffiles(const char *dir)
 
     conffilename[n - 1] = '\0';
     varbuf_reset(&controlfile);
-    varbufprintf(&controlfile, "%s/%s", dir, conffilename);
+    varbuf_printf(&controlfile, "%s/%s", dir, conffilename);
     if (lstat(controlfile.buf, &controlstab)) {
       if (errno == ENOENT) {
         if ((n > 1) && isspace(conffilename[n - 2]))
@@ -328,7 +328,7 @@ check_new_pkg(const char *dir)
   int warns;
 
   /* Start by reading in the control file so we can check its contents. */
-  varbufprintf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONTROLFILE);
+  varbuf_printf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONTROLFILE);
   parsedb(controlfile.buf, pdb_recordavailable | pdb_rejectstatus, &pkg);
 
   if (strspn(pkg->name, "abcdefghijklmnopqrstuvwxyz0123456789+-.") !=
@@ -372,8 +372,8 @@ pkg_get_pathname(const char *dir, struct pkginfo *pkg)
 
   versionstring = versiondescribe(&pkg->available.version, vdew_never);
   arch = pkg->available.architecture;
-  varbufprintf(&path, "%s/%s_%s%s%s%s", dir, pkg->name, versionstring,
-               arch ? "_" : "", arch ? arch : "", DEBEXT);
+  varbuf_printf(&path, "%s/%s_%s%s%s%s", dir, pkg->name, versionstring,
+                arch ? "_" : "", arch ? arch : "", DEBEXT);
 
   return varbuf_detach(&path);
 }

dpkg-split/split.c

@@ -174,15 +174,15 @@ mksplit(const char *file_src, const char *prefix, size_t maxpartsize,
 			struct varbuf refname = VARBUF_INIT;
 			int prefix_max;
 
-			varbufprintf(&refname, "%dof%d", curpart, nparts);
+			varbuf_printf(&refname, "%dof%d", curpart, nparts);
 			prefix_max = max(8 - strlen(refname.buf), 0);
-			varbufprintf(&file_dst, "%s/%.*s%.8s.deb",
-			             prefixdir, prefix_max, prefix,
-			             refname.buf);
+			varbuf_printf(&file_dst, "%s/%.*s%.8s.deb",
+			              prefixdir, prefix_max, prefix,
+			              refname.buf);
 			varbuf_destroy(&refname);
 		} else {
-			varbufprintf(&file_dst, "%s.%dof%d.deb",
-			             prefix, curpart, nparts);
+			varbuf_printf(&file_dst, "%s.%dof%d.deb",
+			              prefix, curpart, nparts);
 		}
 
 		if (curpart == nparts)
@@ -204,15 +204,15 @@ mksplit(const char *file_src, const char *prefix, size_t maxpartsize,
 		dpkg_ar_put_magic(file_dst.buf, fd_dst);
 
 		/* Write the debian-split part. */
-		varbufprintf(&partmagic, "%s\n%s\n%s\n%s\n%zu\n%zu\n%d/%d\n",
-		             SPLITVERSION, package, version, hash,
-		             st.st_size, partsize, curpart, nparts);
+		varbuf_printf(&partmagic, "%s\n%s\n%s\n%s\n%zu\n%zu\n%d/%d\n",
+		              SPLITVERSION, package, version, hash,
+		              st.st_size, partsize, curpart, nparts);
 		dpkg_ar_member_put_mem(file_dst.buf, fd_dst, PARTMAGIC,
 		                       partmagic.buf, partmagic.used);
 		varbuf_reset(&partmagic);
 
 		/* Write the data part. */
-		varbufprintf(&partname, "data.%d", curpart);
+		varbuf_printf(&partname, "data.%d", curpart);
 		dpkg_ar_member_put_file(file_dst.buf, fd_dst, partname.buf,
 		                        fd_src, partsize);
 		varbuf_reset(&partname);

lib/dpkg/dbmodify.c

@@ -150,7 +150,7 @@ modstatdb_is_locked(const char *admindir)
   int lockfd;
   bool locked;
 
-  varbufprintf(&lockfile, "%s/%s", admindir, LOCKFILE);
+  varbuf_printf(&lockfile, "%s/%s", admindir, LOCKFILE);
 
   if (dblockfd == -1) {
     lockfd = open(lockfile.buf, O_RDONLY);

lib/dpkg/dir.c

@@ -103,7 +103,7 @@ dir_file_sync(const char *dir, const char *filename)
 	struct varbuf path = VARBUF_INIT;
 	int fd;
 
-	varbufprintf(&path, "%s/%s", dir, filename);
+	varbuf_printf(&path, "%s/%s", dir, filename);
 
 	fd = open(path.buf, O_WRONLY);
 	if (fd < 0)

lib/dpkg/libdpkg.Versions

@@ -59,7 +59,7 @@ LIBDPKG_PRIVATE {
 	varbuf_dup_char;
 	varbuf_map_char;
 	varbuf_add_buf;
-	varbufprintf;
+	varbuf_printf;
 	varbufvprintf;
 	varbuf_detach;
 	varbuf_destroy;

lib/dpkg/parsehelp.c

@@ -172,7 +172,7 @@ void varbufversion
         (!version->revision || !strchr(version->revision,':'))) break;
     /* Fall through. */
   case vdew_always:
-    varbufprintf(vb,"%lu:",version->epoch);
+    varbuf_printf(vb, "%lu:", version->epoch);
     break;
   default:
     internerr("unknown versiondisplayepochwhen '%d'", vdew);

lib/dpkg/path.c

@@ -94,7 +94,7 @@ path_make_temp_template(const char *suffix)
 	if (!tmpdir)
 		tmpdir = "/tmp";
 
-	varbufprintf(&template, "%s/%s.XXXXXX", tmpdir, suffix);
+	varbuf_printf(&template, "%s/%s.XXXXXX", tmpdir, suffix);
 
 	return varbuf_detach(&template);
 }

lib/dpkg/pkg-format.c

@@ -219,7 +219,7 @@ pkg_format_show(const struct pkg_format_node *head,
 			strcpy(fmt, "%s");
 
 		if (head->type == string) {
-			varbufprintf(&fb, fmt, head->data);
+			varbuf_printf(&fb, fmt, head->data);
 			ok = true;
 		} else if (head->type == field) {
 			const struct fieldinfo *fip;
@@ -229,7 +229,7 @@ pkg_format_show(const struct pkg_format_node *head,
 					fip->wcall(&wb, pkg, pif, 0, fip);
 
 					varbuf_add_char(&wb, '\0');
-					varbufprintf(&fb, fmt, wb.buf);
+					varbuf_printf(&fb, fmt, wb.buf);
 					varbuf_reset(&wb);
 					ok = true;
 					break;
@@ -240,7 +240,7 @@ pkg_format_show(const struct pkg_format_node *head,
 
 				for (afp = pif->arbs; afp; afp = afp->next)
 					if (strcasecmp(head->data, afp->name) == 0) {
-						varbufprintf(&fb, fmt, afp->value);
+						varbuf_printf(&fb, fmt, afp->value);
 						ok = true;
 						break;
 					}

lib/dpkg/test/t-varbuf.c

@@ -206,7 +206,7 @@ test_varbuf_printf(void)
 	varbuf_init(&vb, 5);
 
 	/* Test normal format printing. */
-	varbufprintf(&vb, "format %s number %d", "string", 10);
+	varbuf_printf(&vb, "format %s number %d", "string", 10);
 	varbuf_add_char(&vb, '\0');
 	test_pass(vb.used == sizeof("format string number 10"));
 	test_pass(vb.size >= vb.used);
@@ -215,8 +215,8 @@ test_varbuf_printf(void)
 	varbuf_reset(&vb);
 
 	/* Test concatenated format printing. */
-	varbufprintf(&vb, "format %s number %d", "string", 10);
-	varbufprintf(&vb, " extra %s", "string");
+	varbuf_printf(&vb, "format %s number %d", "string", 10);
+	varbuf_printf(&vb, " extra %s", "string");
 	varbuf_add_char(&vb, '\0');
 	test_pass(vb.used == sizeof("format string number 10 extra string"));
 	test_pass(vb.size >= vb.used);

lib/dpkg/triglib.c

@@ -64,7 +64,7 @@ trig_get_triggersdir(const char *admindir)
 {
 	struct varbuf path = VARBUF_INIT;
 
-	varbufprintf(&path, "%s/%s", admindir, TRIGGERSDIR);
+	varbuf_printf(&path, "%s/%s", admindir, TRIGGERSDIR);
 
 	return varbuf_detach(&path);
 }
@@ -74,7 +74,7 @@ trig_get_filename(const char *dir, const char *filename)
 {
 	struct varbuf path = VARBUF_INIT;
 
-	varbufprintf(&path, "%s/%s", dir, filename);
+	varbuf_printf(&path, "%s/%s", dir, filename);
 
 	return varbuf_detach(&path);
 }
@@ -422,7 +422,7 @@ trk_explicit_interest_change(const char *trig,  struct pkginfo *pkg, int signum)
 
 	trk_explicit_start(trig);
 	varbuf_reset(&newfn);
-	varbufprintf(&newfn, "%s/%s.new", triggersdir, trig);
+	varbuf_printf(&newfn, "%s/%s.new", triggersdir, trig);
 	varbuf_add_char(&newfn, '\0');
 
 	nf = fopen(newfn.buf, "w");

lib/dpkg/varbuf.c

@@ -55,7 +55,9 @@ varbuf_map_char(struct varbuf *v, int c_src, int c_dst)
       v->buf[i] = c_dst;
 }
 
-int varbufprintf(struct varbuf *v, const char *fmt, ...) {
+int
+varbuf_printf(struct varbuf *v, const char *fmt, ...)
+{
   int r;
   va_list args;
 

lib/dpkg/varbuf.h

@@ -77,7 +77,7 @@ void varbuf_map_char(struct varbuf *v, int c_src, int c_dst);
 #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 varbuf_printf(struct varbuf *v, const char *fmt, ...) DPKG_ATTR_PRINTF(2);
 int varbufvprintf(struct varbuf *v, const char *fmt, va_list va)
 	DPKG_ATTR_VPRINTF(2);
 

src/depcon.c

@@ -201,7 +201,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
   varbufdependency(&depstr, dep);
   varbuf_add_char(&depstr, '\0');
 
-  varbufprintf(addto, fmt, dep->up->name, depstr.buf);
+  varbuf_printf(addto, fmt, dep->up->name, depstr.buf);
   varbuf_destroy(&depstr);
 }
 

src/divertcmd.c

@@ -160,7 +160,7 @@ check_writable_dir(struct file *f)
 	struct varbuf tmpname = VARBUF_INIT;
 	int tmpfd;
 
-	varbufprintf(&tmpname, "%s%s", f->name, ".dpkg-divert.tmp");
+	varbuf_printf(&tmpname, "%s%s", f->name, ".dpkg-divert.tmp");
 
 	tmpfd = creat(tmpname.buf, 0600);
 	if (tmpfd < 0)
@@ -243,7 +243,7 @@ rename_mv(const char *src, const char *dst)
 	if (rename(src, dst) == 0)
 		return 0;
 
-	varbufprintf(&tmpdst, "%s%s", dst, ".dpkg-divert.tmp");
+	varbuf_printf(&tmpdst, "%s%s", dst, ".dpkg-divert.tmp");
 
 	/* If a simple rename didn't work try an atomic copy, rename, unlink
 	 * instead. */
@@ -292,17 +292,17 @@ varbuf_diversion(struct varbuf *str, const char *pkgname,
 
 	if (pkgname == NULL) {
 		if (divertto == NULL)
-			varbufprintf(str, _("local diversion of %s"), filename);
+			varbuf_printf(str, _("local diversion of %s"), filename);
 		else
-			varbufprintf(str, _("local diversion of %s to %s"),
-			             filename, divertto);
+			varbuf_printf(str, _("local diversion of %s to %s"),
+			              filename, divertto);
 	} else {
 		if (divertto == NULL)
-			varbufprintf(str, _("diversion of %s by %s"),
-			             filename, pkgname);
+			varbuf_printf(str, _("diversion of %s by %s"),
+			              filename, pkgname);
 		else
-			varbufprintf(str, _("diversion of %s to %s by %s"),
-			             filename, divertto, pkgname);
+			varbuf_printf(str, _("diversion of %s to %s by %s"),
+			              filename, divertto, pkgname);
 	}
 
 	return str->buf;
@@ -317,10 +317,10 @@ diversion_current(const char *filename)
 		varbuf_reset(&str);
 
 		if (opt_divertto == NULL)
-			varbufprintf(&str, _("any diversion of %s"), filename);
+			varbuf_printf(&str, _("any diversion of %s"), filename);
 		else
-			varbufprintf(&str, _("any diversion of %s to %s"),
-			             filename, opt_divertto);
+			varbuf_printf(&str, _("any diversion of %s to %s"),
+			              filename, opt_divertto);
 	} else {
 		return varbuf_diversion(&str, opt_pkgname, filename, opt_divertto);
 	}
@@ -361,9 +361,9 @@ divertdb_write(void)
 	struct varbuf dbname_new = VARBUF_INIT;
 	struct varbuf dbname_old = VARBUF_INIT;
 
-	varbufprintf(&dbname, "%s/%s", admindir, DIVERSIONSFILE);
-	varbufprintf(&dbname_new, "%s%s", dbname.buf, NEWDBEXT);
-	varbufprintf(&dbname_old, "%s%s", dbname.buf, OLDDBEXT);
+	varbuf_printf(&dbname, "%s/%s", admindir, DIVERSIONSFILE);
+	varbuf_printf(&dbname_new, "%s%s", dbname.buf, NEWDBEXT);
+	varbuf_printf(&dbname_old, "%s%s", dbname.buf, OLDDBEXT);
 
 	dbfile = fopen(dbname_new.buf, "w");
 	if (!dbfile)
@@ -436,7 +436,7 @@ diversion_add(const char *const *argv)
 	if (opt_divertto == NULL) {
 		struct varbuf str = VARBUF_INIT;
 
-		varbufprintf(&str, "%s.distrib", filename);
+		varbuf_printf(&str, "%s.distrib", filename);
 		opt_divertto = varbuf_detach(&str);
 	}
 	if (opt_divertto[0] != '/')

src/packages.c

@@ -329,12 +329,12 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
   thisf = found_none;
   if (possdependee == removing) {
     if (providing) {
-      varbufprintf(oemsgs,
-		   _("  Package %s which provides %s is to be removed.\n"),
-		   possdependee->name, providing->name);
+      varbuf_printf(oemsgs,
+                    _("  Package %s which provides %s is to be removed.\n"),
+                    possdependee->name, providing->name);
     } else {
-      varbufprintf(oemsgs, _("  Package %s is to be removed.\n"),
-		   possdependee->name);
+      varbuf_printf(oemsgs, _("  Package %s is to be removed.\n"),
+                    possdependee->name);
     }
 
     *matched = true;
@@ -350,10 +350,10 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
   case stat_triggerspending:
   case stat_installed:
     if (checkversion && !versionsatisfied(&possdependee->installed,checkversion)) {
-      varbufprintf(oemsgs, _("  Version of %s on system is %s.\n"),
-		   possdependee->name,
-		   versiondescribe(&possdependee->installed.version,
-				   vdew_nonambig));
+      varbuf_printf(oemsgs, _("  Version of %s on system is %s.\n"),
+                    possdependee->name,
+                    versiondescribe(&possdependee->installed.version,
+                                    vdew_nonambig));
       assert(checkversion->verrel != dvr_none);
       if (fc_depends || fc_dependsversion)
         thisf = (dependtry >= 3) ? found_forced : found_defer;
@@ -371,13 +371,13 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
       if (removing || !(f_triggers ||
                         possdependee->clientdata->istobe == itb_installnew)) {
         if (providing) {
-          varbufprintf(oemsgs,
-                       _("  Package %s which provides %s awaits trigger processing.\n"),
-                       possdependee->name, providing->name);
+          varbuf_printf(oemsgs,
+                        _("  Package %s which provides %s awaits trigger processing.\n"),
+                        possdependee->name, providing->name);
         } else {
-          varbufprintf(oemsgs,
-                       _("  Package %s awaits trigger processing.\n"),
-                       possdependee->name);
+          varbuf_printf(oemsgs,
+                        _("  Package %s awaits trigger processing.\n"),
+                        possdependee->name);
         }
         debug(dbg_depcondetail, "      triggers-awaited, no fixbytrig");
         goto unsuitable;
@@ -413,12 +413,12 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
       return found_defer;
     } else {
       if (providing) {
-	varbufprintf(oemsgs,
-		     _("  Package %s which provides %s is not configured yet.\n"),
-		     possdependee->name, providing->name);
+        varbuf_printf(oemsgs,
+                      _("  Package %s which provides %s is not configured yet.\n"),
+                      possdependee->name, providing->name);
       } else {
-	varbufprintf(oemsgs, _("  Package %s is not configured yet.\n"),
-		     possdependee->name);
+        varbuf_printf(oemsgs, _("  Package %s is not configured yet.\n"),
+                      possdependee->name);
       }
 
       debug(dbg_depcondetail, "      not configured/able");
@@ -427,12 +427,12 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
 
   default:
     if (providing) {
-      varbufprintf(oemsgs,
-		   _("  Package %s which provides %s is not installed.\n"),
-		   possdependee->name, providing->name);
+      varbuf_printf(oemsgs,
+                    _("  Package %s which provides %s is not installed.\n"),
+                    possdependee->name, providing->name);
     } else {
-      varbufprintf(oemsgs, _("  Package %s is not installed.\n"),
-		   possdependee->name);
+      varbuf_printf(oemsgs, _("  Package %s is not installed.\n"),
+                    possdependee->name);
     }
 
     debug(dbg_depcondetail, "      not installed");
@@ -468,22 +468,19 @@ breaks_check_one(struct varbuf *aemsgs, enum dep_check *ok,
 
   varbufdependency(&depmsg, breaks->up);
   varbuf_add_char(&depmsg, '\0');
-  varbufprintf(aemsgs, _(" %s (%s) breaks %s and is %s.\n"),
-               breaker->name,
-               versiondescribe(&breaker->installed.version, vdew_nonambig),
-               depmsg.buf,
-               gettext(statusstrings[breaker->status]));
+  varbuf_printf(aemsgs, _(" %s (%s) breaks %s and is %s.\n"), breaker->name,
+                versiondescribe(&breaker->installed.version, vdew_nonambig),
+                depmsg.buf, gettext(statusstrings[breaker->status]));
   varbuf_destroy(&depmsg);
 
   if (virtbroken) {
-    varbufprintf(aemsgs, _("  %s (%s) provides %s.\n"),
-                 broken->name,
-                 versiondescribe(&broken->installed.version, vdew_nonambig),
-                 virtbroken->name);
+    varbuf_printf(aemsgs, _("  %s (%s) provides %s.\n"), broken->name,
+                  versiondescribe(&broken->installed.version, vdew_nonambig),
+                  virtbroken->name);
   } else if (breaks->verrel != dvr_none) {
-    varbufprintf(aemsgs, _("  Version of %s to be configured is %s.\n"),
-                 broken->name,
-                 versiondescribe(&broken->installed.version, vdew_nonambig));
+    varbuf_printf(aemsgs, _("  Version of %s to be configured is %s.\n"),
+                  broken->name,
+                  versiondescribe(&broken->installed.version, vdew_nonambig));
     if (fc_dependsversion) return;
   }
   if (force_breaks(breaks)) return;