libdpkg: Rename varbufreset() to varbuf_reset()

Make the varbuf API a bit more consistent.

dpkg-deb/build.c

@@ -102,7 +102,7 @@ file_info_get(const char *root, int fd)
   struct file_info *fi;
   size_t root_len;
 
-  varbufreset(&fn);
+  varbuf_reset(&fn);
   root_len = varbufprintf(&fn, "%s/", root);
 
   while (1) {
@@ -193,7 +193,7 @@ check_file_perms(const char *dir)
            (unsigned long)(mscriptstab.st_mode & 07777));
 
   for (mscriptp = maintainerscripts; *mscriptp; mscriptp++) {
-    varbufreset(&path);
+    varbuf_reset(&path);
     varbufprintf(&path, "%s/%s/%s", dir, BUILDCONTROLDIR, *mscriptp);
     if (!lstat(path.buf, &mscriptstab)) {
       if (S_ISLNK(mscriptstab.st_mode))
@@ -254,7 +254,7 @@ check_conffiles(const char *dir)
     }
 
     conffilename[n - 1] = '\0';
-    varbufreset(&controlfile);
+    varbuf_reset(&controlfile);
     varbufprintf(&controlfile, "%s/%s", dir, conffilename);
     if (lstat(controlfile.buf, &controlstab)) {
       if (errno == ENOENT) {

dpkg-deb/info.c

@@ -97,7 +97,7 @@ info_spew(const char *debar, const char *dir, const char *const *argv)
   int re= 0;
 
   while ((component = *argv++) != NULL) {
-    varbufreset(&controlfile);
+    varbuf_reset(&controlfile);
     varbufaddstr(&controlfile, dir);
     varbufaddc(&controlfile, '/');
     varbufaddstr(&controlfile, component);

dpkg-split/split.c

@@ -70,7 +70,7 @@ deb_field(const char *filename, const char *field)
 	close(p[1]);
 
 	/* Parant reads from pipe. */
-	varbufreset(&buf);
+	varbuf_reset(&buf);
 	fd_vbuf_copy(p[0], &buf, -1, _("package field value extraction"));
 	varbufaddc(&buf, '\0');
 
@@ -168,7 +168,7 @@ mksplit(const char *file_src, const char *prefix, size_t maxpartsize,
 	for (curpart = 1; curpart <= nparts; curpart++) {
 		int fd_dst;
 
-		varbufreset(&file_dst);
+		varbuf_reset(&file_dst);
 		/* Generate output filename. */
 		if (msdos) {
 			struct varbuf refname = VARBUF_INIT;
@@ -209,13 +209,13 @@ mksplit(const char *file_src, const char *prefix, size_t maxpartsize,
 		             st.st_size, partsize, curpart, nparts);
 		dpkg_ar_member_put_mem(file_dst.buf, fd_dst, PARTMAGIC,
 		                       partmagic.buf, partmagic.used);
-		varbufreset(&partmagic);
+		varbuf_reset(&partmagic);
 
 		/* Write the data part. */
 		varbufprintf(&partname, "data.%d", curpart);
 		dpkg_ar_member_put_file(file_dst.buf, fd_dst, partname.buf,
 		                        fd_src, partsize);
-		varbufreset(&partname);
+		varbuf_reset(&partname);
 
 		close(fd_dst);
 

lib/dpkg/dbmodify.c

@@ -314,7 +314,7 @@ modstatdb_note_core(struct pkginfo *pkg)
 {
   assert(cstatus >= msdbrw_write);
 
-  varbufreset(&uvb);
+  varbuf_reset(&uvb);
   varbufrecord(&uvb, pkg, &pkg->installed);
 
   if (fwrite(uvb.buf, 1, uvb.used, importanttmp) != uvb.used)
@@ -405,7 +405,7 @@ pkgadmindir(void)
 
 const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
   static struct varbuf vb;
-  varbufreset(&vb);
+  varbuf_reset(&vb);
   varbufaddstr(&vb, infodir);
   varbufaddstr(&vb,pkg->name);
   varbufaddc(&vb,'.');

lib/dpkg/dump.c

@@ -393,7 +393,7 @@ writedb(const char *filename, bool available, bool mustsync)
     if (fputs(vb.buf,file) < 0)
       ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"),
               which, pigp->name, filename);
-    varbufreset(&vb);
+    varbuf_reset(&vb);
   }
   pkg_db_iter_free(it);
   varbuf_destroy(&vb);

lib/dpkg/fields.c

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

lib/dpkg/libdpkg.Versions

@@ -52,7 +52,7 @@ LIBDPKG_PRIVATE {
 
 	# Variable buffer support
 	varbuf_init;
-	varbufreset;
+	varbuf_reset;
 	varbuf_grow;
 	varbuf_trunc;
 	varbufaddc;

lib/dpkg/log.c

@@ -60,7 +60,7 @@ log_message(const char *fmt, ...)
 	}
 
 	va_start(args, fmt);
-	varbufreset(&log);
+	varbuf_reset(&log);
 	varbufvprintf(&log, fmt, args);
 	varbufaddc(&log, 0);
 	va_end(args);
@@ -102,7 +102,7 @@ statusfd_send(const char *fmt, ...)
 		return;
 
 	va_start(args, fmt);
-	varbufreset(&vb);
+	varbuf_reset(&vb);
 	varbufvprintf(&vb, fmt, args);
 	/* Sanitize string to not include new lines, as front-ends should be
 	 * doing their own word-wrapping. */

lib/dpkg/parsehelp.c

@@ -197,7 +197,7 @@ const char *versiondescribe
     return C_("version", "<none>");
 
   vb= &bufs[bufnum]; bufnum++; if (bufnum == 10) bufnum= 0;
-  varbufreset(vb);
+  varbuf_reset(vb);
   varbufversion(vb,version,vdew);
   varbufaddc(vb,0);
 

lib/dpkg/pkg-format.c

@@ -230,7 +230,7 @@ pkg_format_show(const struct pkg_format_node *head,
 
 					varbufaddc(&wb, '\0');
 					varbufprintf(&fb, fmt, wb.buf);
-					varbufreset(&wb);
+					varbuf_reset(&wb);
 					ok = true;
 					break;
 				}
@@ -254,7 +254,7 @@ pkg_format_show(const struct pkg_format_node *head,
 			varbufaddbuf(&vb, fb.buf, len);
 		}
 
-		varbufreset(&fb);
+		varbuf_reset(&fb);
 		head = head->next;
 	}
 

lib/dpkg/test/t-varbuf.c

@@ -212,7 +212,7 @@ test_varbuf_printf(void)
 	test_pass(vb.size >= vb.used);
 	test_str(vb.buf, ==, "format string number 10");
 
-	varbufreset(&vb);
+	varbuf_reset(&vb);
 
 	/* Test concatenated format printing. */
 	varbufprintf(&vb, "format %s number %d", "string", 10);
@@ -234,7 +234,7 @@ test_varbuf_reset(void)
 
 	varbufaddbuf(&vb, "1234567890", 10);
 
-	varbufreset(&vb);
+	varbuf_reset(&vb);
 	test_pass(vb.used == 0);
 	test_pass(vb.size >= vb.used);
 

lib/dpkg/trigdeferred.l

@@ -99,7 +99,7 @@ static FILE *trig_new_deferred;
 static void
 constructfn(struct varbuf *vb, const char *dir, const char *tail)
 {
-	varbufreset(vb);
+	varbuf_reset(vb);
 	varbufaddstr(vb, dir);
 	varbufaddstr(vb, tail);
 	varbufaddc(vb, 0);

lib/dpkg/triglib.c

@@ -362,7 +362,7 @@ trk_explicit_start(const char *trig)
 {
 	trk_explicit_activate_done();
 
-	varbufreset(&trk_explicit_fn);
+	varbuf_reset(&trk_explicit_fn);
 	varbufaddstr(&trk_explicit_fn, triggersdir);
 	varbufaddstr(&trk_explicit_fn, trig);
 	varbufaddc(&trk_explicit_fn, 0);
@@ -421,7 +421,7 @@ trk_explicit_interest_change(const char *trig,  struct pkginfo *pkg, int signum)
 	FILE *nf;
 
 	trk_explicit_start(trig);
-	varbufreset(&newfn);
+	varbuf_reset(&newfn);
 	varbufprintf(&newfn, "%s/%s.new", triggersdir, trig);
 	varbufaddc(&newfn, 0);
 

lib/dpkg/varbuf.c

@@ -109,7 +109,9 @@ varbuf_init(struct varbuf *v, size_t size)
     v->buf = NULL;
 }
 
-void varbufreset(struct varbuf *v) {
+void
+varbuf_reset(struct varbuf *v)
+{
   v->used= 0;
 }
 

lib/dpkg/varbuf.h

@@ -68,7 +68,7 @@ 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);
-void varbufreset(struct varbuf *v);
+void varbuf_reset(struct varbuf *v);
 void varbuf_destroy(struct varbuf *v);
 
 void varbufaddc(struct varbuf *v, int c);

src/archives.c

@@ -383,7 +383,7 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
     return false;
 
   /* But is it to the same dir? */
-  varbufreset(symlinkfn);
+  varbuf_reset(symlinkfn);
   if (ti->linkname[0] == '/') {
     varbufaddstr(symlinkfn, instdir);
   } else {
@@ -737,7 +737,7 @@ tarobject(void *ctx, struct tar_entry *ti)
     newtarobject_allmodes(fnamenewvb.buf, st);
     break;
   case tar_filetype_hardlink:
-    varbufreset(&hardlinkfn);
+    varbuf_reset(&hardlinkfn);
     varbufaddstr(&hardlinkfn,instdir); varbufaddc(&hardlinkfn,'/');
     varbufaddstr(&hardlinkfn, ti->linkname);
     linknode = findnamenode(ti->linkname, 0);
@@ -804,7 +804,7 @@ tarobject(void *ctx, struct tar_entry *ti)
       /* We can't make a symlink with two hardlinks, so we'll have to
        * copy it. (Pretend that making a copy of a symlink is the same
        * as linking to it.) */
-      varbufreset(&symlinkfn);
+      varbuf_reset(&symlinkfn);
       varbuf_grow(&symlinkfn, stab.st_size + 1);
       r = readlink(fnamevb.buf, symlinkfn.buf, symlinkfn.size);
       if (r < 0)
@@ -1238,7 +1238,7 @@ void archivefiles(const char *const *argv) {
 
     nfiles= 0;
     pf= fdopen(pi[0],"r");  if (!pf) ohshite(_("failed to fdopen find's pipe"));
-    varbufreset(&findoutput);
+    varbuf_reset(&findoutput);
     while ((c= fgetc(pf)) != EOF) {
       varbufaddc(&findoutput,c);
       if (!c) nfiles++;
@@ -1273,9 +1273,9 @@ void archivefiles(const char *const *argv) {
 
   /* Initialize fname variables contents. */
 
-  varbufreset(&fnamevb);
-  varbufreset(&fnametmpvb);
-  varbufreset(&fnamenewvb);
+  varbuf_reset(&fnamevb);
+  varbuf_reset(&fnametmpvb);
+  varbuf_reset(&fnamenewvb);
 
   varbufaddstr(&fnamevb,instdir); varbufaddc(&fnamevb,'/');
   varbufaddstr(&fnametmpvb,instdir); varbufaddc(&fnametmpvb,'/');

src/configure.c

@@ -86,7 +86,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 	}
 	md5hash(pkg, currenthash, cdr.buf);
 
-	varbufreset(&cdr2);
+	varbuf_reset(&cdr2);
 	varbufaddstr(&cdr2, cdr.buf);
 	varbufaddc(&cdr2, 0);
 	/* XXX: Make sure there's enough room for extensions. */
@@ -376,7 +376,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 	int r;
 	int loopprotect;
 
-	varbufreset(result);
+	varbuf_reset(result);
 	varbufaddstr(result, instdir);
 	if (*in != '/')
 		varbufaddc(result, '/');
@@ -408,7 +408,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 				return -1;
 			}
 
-			varbufreset(&target);
+			varbuf_reset(&target);
 			varbuf_grow(&target, stab.st_size + 1);
 			r = readlink(result->buf, target.buf, target.size);
 			if (r < 0) {
@@ -426,7 +426,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 			      r, target.buf);
 
 			if (target.buf[0] == '/') {
-				varbufreset(result);
+				varbuf_reset(result);
 				varbufaddstr(result, instdir);
 				debug(dbg_conffdetail,
 				      "conffderef readlink absolute");

src/depcon.c

@@ -271,7 +271,7 @@ depisok(struct dependency *dep, struct varbuf *whynot,
   }
 
   /* Describe the dependency, in case we have to moan about it. */
-  varbufreset(whynot);
+  varbuf_reset(whynot);
   varbufaddc(whynot, ' ');
   describedepcon(whynot, dep);
   varbufaddc(whynot,'\n');

src/divertcmd.c

@@ -288,7 +288,7 @@ static const char *
 varbuf_diversion(struct varbuf *str, const char *pkgname,
                  const char *filename, const char *divertto)
 {
-	varbufreset(str);
+	varbuf_reset(str);
 
 	if (pkgname == NULL) {
 		if (divertto == NULL)
@@ -314,7 +314,7 @@ diversion_current(const char *filename)
 	static struct varbuf str = VARBUF_INIT;
 
 	if (opt_pkgname_match_any) {
-		varbufreset(&str);
+		varbuf_reset(&str);
 
 		if (opt_divertto == NULL)
 			varbufprintf(&str, _("any diversion of %s"), filename);

src/divertdb.c

@@ -53,7 +53,7 @@ ensure_diversions(void)
 	FILE *file;
 	struct diversion *ov, *oicontest, *oialtname;
 
-	varbufreset(&vb);
+	varbuf_reset(&vb);
 	varbufaddstr(&vb, admindir);
 	varbufaddstr(&vb, "/" DIVERSIONSFILE);
 	varbufaddc(&vb, 0);

src/enquiry.c

@@ -404,7 +404,7 @@ void predeppackage(const char *const *argv) {
       }
     }
     if (!pkg) {
-      varbufreset(&vb);
+      varbuf_reset(&vb);
       describedepcon(&vb,dep);
       varbufaddc(&vb,0);
       fprintf(stderr, _("dpkg: cannot see how to satisfy pre-dependency:\n %s\n"),vb.buf);

src/filesdb.c

@@ -464,13 +464,13 @@ write_filelist_except(struct pkginfo *pkg, struct fileinlist *list,
   static struct varbuf vb, newvb;
   FILE *file;
 
-  varbufreset(&vb);
+  varbuf_reset(&vb);
   varbufaddstr(&vb, pkgadmindir());
   varbufaddstr(&vb,pkg->name);
   varbufaddstr(&vb,"." LISTFILE);
   varbufaddc(&vb,0);
 
-  varbufreset(&newvb);
+  varbuf_reset(&newvb);
   varbufaddstr(&newvb,vb.buf);
   varbufaddstr(&newvb,NEWDBEXT);
   varbufaddc(&newvb,0);

src/help.c

@@ -115,7 +115,7 @@ void checkpath(void) {
       path_end = strchr(path, ':');
       path_len = path_end ? (size_t)(path_end - path) : strlen(path);
 
-      varbufreset(&filename);
+      varbuf_reset(&filename);
       varbufaddbuf(&filename, path, path_len);
       if (path_len)
         varbufaddc(&filename, '/');

src/main.c

@@ -628,7 +628,7 @@ void commandfd(const char *const *argv) {
       do { c= getc(in); if (c == '\n') lno++; } while (c != EOF && c != '\n');
       continue;
     }
-    varbufreset(&linevb);
+    varbuf_reset(&linevb);
     do {
       varbufaddc(&linevb,c);
       c= getc(in);

src/packages.c

@@ -553,7 +553,7 @@ dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
     if (dep->type != dep_depends && dep->type != dep_predepends) continue;
     debug(dbg_depcondetail,"  checking group ...");
     matched = false;
-    varbufreset(&oemsgs);
+    varbuf_reset(&oemsgs);
     found = found_none;
     possfixbytrig = NULL;
     for (possi = dep->list; found != found_ok && possi; possi = possi->next) {

src/processarc.c

@@ -746,7 +746,7 @@ void process_archive(const char *filename) {
 	if (!cfile->namenode->filestat) {
 	  struct stat tmp_stat;
 
-	  varbufreset(&cfilename);
+	  varbuf_reset(&cfilename);
 	  varbufaddstr(&cfilename, instdir);
 	  varbufaddc(&cfilename, '/');
 	  varbufaddstr(&cfilename, cfile->namenode->name);
@@ -833,7 +833,7 @@ void process_archive(const char *filename) {
    * them as appropriate; then we go through the new scripts
    * (any that are left) and install them. */
   debug(dbg_general, "process_archive updating info directory");
-  varbufreset(&infofnvb);
+  varbuf_reset(&infofnvb);
   varbufaddstr(&infofnvb, pkgadmindir());
   infodirlen= infofnvb.used;
   varbufaddc(&infofnvb,0);
@@ -1112,7 +1112,7 @@ void process_archive(const char *filename) {
                                 NULL);
 
     /* OK, now we delete all the stuff in the ‘info’ directory .. */
-    varbufreset(&fnvb);
+    varbuf_reset(&fnvb);
     varbufaddstr(&fnvb, pkgadmindir());
     infodirbaseused= fnvb.used;
     varbufaddc(&fnvb,0);

src/querycmd.c

@@ -311,7 +311,7 @@ searchfiles(const char *const *argv)
     /* Trim trailing ‘/’ and ‘/.’ from the argument if it's
      * not a pattern, just a path. */
     if (!strpbrk(thisarg, "*[?\\")) {
-      varbufreset(&path);
+      varbuf_reset(&path);
       varbufaddstr(&path, thisarg);
       varbufaddc(&path, '\0');
 
@@ -321,7 +321,7 @@ searchfiles(const char *const *argv)
     }
 
     if (!strchr("*[?/",*thisarg)) {
-      varbufreset(&vb);
+      varbuf_reset(&vb);
       varbufaddc(&vb,'*');
       varbufaddstr(&vb,thisarg);
       varbufaddc(&vb,'*');

src/remove.c

@@ -216,7 +216,7 @@ static void removal_bulk_remove_files(
       usenode = namenodetouse(namenode, pkg);
       trig_file_activate(usenode, pkg);
 
-      varbufreset(&fnvb);
+      varbuf_reset(&fnvb);
       varbufaddstr(&fnvb,instdir);
       varbufaddstr(&fnvb, usenode->name);
       before= fnvb.used;
@@ -268,7 +268,7 @@ static void removal_bulk_remove_files(
     write_filelist_except(pkg,leftover,0);
     maintainer_script_installed(pkg, POSTRMFILE, "post-removal",
                                 "remove", NULL);
-    varbufreset(&fnvb);
+    varbuf_reset(&fnvb);
     varbufaddstr(&fnvb, pkgadmindir());
     infodirbaseused= fnvb.used;
     varbufaddc(&fnvb,0);
@@ -338,7 +338,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
     usenode = namenodetouse(namenode, pkg);
     trig_file_activate(usenode, pkg);
 
-    varbufreset(&fnvb);
+    varbuf_reset(&fnvb);
     varbufaddstr(&fnvb,instdir);
     varbufaddstr(&fnvb, usenode->name);
     varbufaddc(&fnvb,0);
@@ -435,7 +435,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
 	debug(dbg_conffdetail, "removal_bulk conffile obsolete %s",
 	      conff->name);
       }
-      varbufreset(&fnvb);
+      varbuf_reset(&fnvb);
       r= conffderef(pkg, &fnvb, conff->name);
       debug(dbg_conffdetail, "removal_bulk conffile `%s' (= `%s')",
             conff->name, r == -1 ? "<r==-1>" : fnvb.buf);
@@ -446,7 +446,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
                 conff->name, fnvb.buf);
       p= strrchr(fnvb.buf,'/'); if (!p) continue;
       *p = '\0';
-      varbufreset(&removevb);
+      varbuf_reset(&removevb);
       varbufaddstr(&removevb,fnvb.buf);
       varbufaddc(&removevb,'/');
       removevbbase= removevb.used;
@@ -555,7 +555,7 @@ void removal_bulk(struct pkginfo *pkg) {
     /* Retry empty directories, and warn on any leftovers that aren't. */
     removal_bulk_remove_leftover_dirs(pkg);
 
-    varbufreset(&fnvb);
+    varbuf_reset(&fnvb);
     varbufaddstr(&fnvb, pkgadmindir());
     varbufaddstr(&fnvb,pkg->name);
     pkgnameused= fnvb.used;

src/select.c

@@ -95,8 +95,8 @@ void setselections(const char *const *argv) {
 
   lno= 1;
   for (;;) {
-    varbufreset(&namevb);
-    varbufreset(&selvb);
+    varbuf_reset(&namevb);
+    varbuf_reset(&selvb);
     do { c= getchar(); if (c == '\n') lno++; } while (c != EOF && isspace(c));
     if (c == EOF) break;
     if (c == '#') {

src/statdb.c

@@ -116,7 +116,7 @@ ensure_statoverrides(void)
 	struct file_stat *fso;
 	struct filenamenode *fnn;
 
-	varbufreset(&vb);
+	varbuf_reset(&vb);
 	varbufaddstr(&vb, admindir);
 	varbufaddstr(&vb, "/" STATOVERRIDEFILE);
 	varbufaddc(&vb, 0);

src/trigproc.c

@@ -312,7 +312,7 @@ trigproc(struct pkginfo *pkg)
 		printf(_("Processing triggers for %s ...\n"), pkg->name);
 		log_action("trigproc", pkg);
 
-		varbufreset(&namesarg);
+		varbuf_reset(&namesarg);
 		for (tp = pkg->trigpend_head; tp; tp = tp->next) {
 			varbufaddc(&namesarg, ' ');
 			varbufaddstr(&namesarg, tp->name);