31 files changed, 149 insertions, 136 deletions

diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 11682bc33..45b5fae4e 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -99,9 +99,9 @@ info_spew(const char *debar, const char *dir, const char *const *argv)
   while ((component = *argv++) != NULL) {
     varbuf_reset(&controlfile);
     varbufaddstr(&controlfile, dir);
-    varbufaddc(&controlfile, '/');
+    varbuf_add_char(&controlfile, '/');
     varbufaddstr(&controlfile, component);
-    varbufaddc(&controlfile, '\0');
+    varbuf_add_char(&controlfile, '\0');
 
     fd = open(controlfile.buf, O_RDONLY);
     if (fd >= 0) {
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index 21dde8f37..b68f49f8e 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -72,7 +72,7 @@ deb_field(const char *filename, const char *field)
 	/* Parant reads from pipe. */
 	varbuf_reset(&buf);
 	fd_vbuf_copy(p[0], &buf, -1, _("package field value extraction"));
-	varbufaddc(&buf, '\0');
+	varbuf_add_char(&buf, '\0');
 
 	close(p[0]);
 
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index 958d00df2..f12d26f23 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -408,8 +408,8 @@ const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
   varbuf_reset(&vb);
   varbufaddstr(&vb, infodir);
   varbufaddstr(&vb,pkg->name);
-  varbufaddc(&vb,'.');
+  varbuf_add_char(&vb, '.');
   varbufaddstr(&vb,whichfile);
-  varbufaddc(&vb,0);
+  varbuf_add_char(&vb, '\0');
   return vb.buf;
 }
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 480403b3d..a88f3aeda 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -50,7 +50,7 @@ void w_name(struct varbuf *vb,
     varbufaddstr(vb,"Package: ");
   varbufaddstr(vb, pigp->name);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_version(struct varbuf *vb,
@@ -61,7 +61,7 @@ void w_version(struct varbuf *vb,
     varbufaddstr(vb,"Version: ");
   varbufversion(vb,&pifp->version,vdew_nonambig);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_configversion(struct varbuf *vb,
@@ -78,7 +78,7 @@ void w_configversion(struct varbuf *vb,
     varbufaddstr(vb,"Config-Version: ");
   varbufversion(vb,&pigp->configversion,vdew_nonambig);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_null(struct varbuf *vb,
@@ -95,7 +95,7 @@ void w_section(struct varbuf *vb,
     varbufaddstr(vb,"Section: ");
   varbufaddstr(vb,value);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_charfield(struct varbuf *vb,
@@ -109,7 +109,7 @@ void w_charfield(struct varbuf *vb,
   }
   varbufaddstr(vb,value);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_filecharf(struct varbuf *vb,
@@ -123,17 +123,17 @@ void w_filecharf(struct varbuf *vb,
 
   if (flags&fw_printheader) {
     varbufaddstr(vb,fip->name);
-    varbufaddc(vb,':');
+    varbuf_add_char(vb, ':');
   }
 
   while (fdp) {
-    varbufaddc(vb,' ');
+    varbuf_add_char(vb, ' ');
     varbufaddstr(vb,FILEFFIELD(fdp,fip->integer,const char*));
     fdp= fdp->next;
   }
 
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_booleandefno(struct varbuf *vb,
@@ -161,7 +161,7 @@ void w_priority(struct varbuf *vb,
                ? pigp->otherpriority
                : priorityinfos[pigp->priority].name);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_status(struct varbuf *vb,
@@ -203,11 +203,13 @@ void w_status(struct varbuf *vb,
 
   if (flags&fw_printheader)
     varbufaddstr(vb,"Status: ");
-  varbufaddstr(vb,wantinfos[pigp->want].name); varbufaddc(vb,' ');
-  varbufaddstr(vb,eflaginfos[pigp->eflag].name); varbufaddc(vb,' ');
+  varbufaddstr(vb, wantinfos[pigp->want].name);
+  varbuf_add_char(vb, ' ');
+  varbufaddstr(vb, eflaginfos[pigp->eflag].name);
+  varbuf_add_char(vb, ' ');
   varbufaddstr(vb,statusinfos[pigp->status].name);
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void varbufdependency(struct varbuf *vb, struct dependency *dep) {
@@ -222,7 +224,9 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep) {
     if (dop->verrel != dvr_none) {
       varbufaddstr(vb," (");
       switch (dop->verrel) {
-      case dvr_exact: varbufaddc(vb,'='); break;
+      case dvr_exact:
+        varbuf_add_char(vb, '=');
+        break;
       case dvr_laterequal: varbufaddstr(vb,">="); break;
       case dvr_earlierequal: varbufaddstr(vb,"<="); break;
       case dvr_laterstrict: varbufaddstr(vb,">>"); break;
@@ -230,9 +234,9 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep) {
       default:
         internerr("unknown verrel '%d'", dop->verrel);
       }
-      varbufaddc(vb,' ');
+      varbuf_add_char(vb, ' ');
       varbufversion(vb,&dop->version,vdew_nonambig);
-      varbufaddc(vb,')');
+      varbuf_add_char(vb, ')');
     }
   }
 }
@@ -257,7 +261,7 @@ void w_dependency(struct varbuf *vb,
     varbufdependency(vb,dyp);
   }
   if ((flags&fw_printheader) && (depdel!=fnbuf))
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void w_conffiles(struct varbuf *vb,
@@ -270,13 +274,16 @@ void w_conffiles(struct varbuf *vb,
   if (flags&fw_printheader)
     varbufaddstr(vb,"Conffiles:\n");
   for (i=pifp->conffiles; i; i= i->next) {
-    if (i!=pifp->conffiles) varbufaddc(vb,'\n');
-    varbufaddc(vb,' '); varbufaddstr(vb,i->name); varbufaddc(vb,' ');
+    if (i != pifp->conffiles)
+      varbuf_add_char(vb, '\n');
+    varbuf_add_char(vb, ' ');
+    varbufaddstr(vb, i->name);
+    varbuf_add_char(vb, ' ');
     varbufaddstr(vb,i->hash);
     if (i->obsolete) varbufaddstr(vb," obsolete");
   }
   if (flags&fw_printheader)
-    varbufaddc(vb,'\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void
@@ -295,11 +302,11 @@ w_trigpend(struct varbuf *vb,
   if (flags & fw_printheader)
     varbufaddstr(vb, "Triggers-Pending:");
   for (tp = pigp->trigpend_head; tp; tp = tp->next) {
-    varbufaddc(vb, ' ');
+    varbuf_add_char(vb, ' ');
     varbufaddstr(vb, tp->name);
   }
   if (flags & fw_printheader)
-    varbufaddc(vb, '\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void
@@ -318,11 +325,11 @@ w_trigaw(struct varbuf *vb,
   if (flags & fw_printheader)
     varbufaddstr(vb, "Triggers-Awaited:");
   for (ta = pigp->trigaw.head; ta; ta = ta->sameaw.next) {
-    varbufaddc(vb, ' ');
+    varbuf_add_char(vb, ' ');
     varbufaddstr(vb, ta->pend->name);
   }
   if (flags & fw_printheader)
-    varbufaddc(vb, '\n');
+    varbuf_add_char(vb, '\n');
 }
 
 void varbufrecord(struct varbuf *vb,
@@ -337,7 +344,7 @@ void varbufrecord(struct varbuf *vb,
     varbufaddstr(vb, afp->name);
     varbufaddstr(vb, ": ");
     varbufaddstr(vb, afp->value);
-    varbufaddc(vb, '\n');
+    varbuf_add_char(vb, '\n');
   }
 }
 
@@ -346,7 +353,7 @@ void writerecord(FILE *file, const char *filename,
   struct varbuf vb = VARBUF_INIT;
 
   varbufrecord(&vb,pigp,pifp);
-  varbufaddc(&vb,'\0');
+  varbuf_add_char(&vb, '\0');
   if (fputs(vb.buf,file) < 0)
     ohshite(_("failed to write details of `%.50s' to `%.250s'"), pigp->name,
 	    filename);
@@ -389,7 +396,8 @@ writedb(const char *filename, bool available, bool mustsync)
     if (!pkg_is_informative(pigp, pifp))
       continue;
     varbufrecord(&vb,pigp,pifp);
-    varbufaddc(&vb,'\n'); varbufaddc(&vb,0);
+    varbuf_add_char(&vb, '\n');
+    varbuf_add_char(&vb, '\0');
     if (fputs(vb.buf,file) < 0)
       ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"),
               which, pigp->name, filename);
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 4dcd24691..e344ce0bc 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -325,7 +325,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
       depnamelength= p - depnamestart ;
       varbuf_reset(&depname);
       varbufaddbuf(&depname, depnamestart, depnamelength);
-      varbufaddc(&depname, '\0');
+      varbuf_add_char(&depname, '\0');
       if (!depname.buf[0])
         parse_error(ps, pigp,
                     _("`%s' field, missing package name, or garbage where "
@@ -426,7 +426,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                         "version unterminated"), fip->name, depname.buf);
         varbuf_reset(&version);
         varbufaddbuf(&version, versionstart, versionlength);
-        varbufaddc(&version, '\0');
+        varbuf_add_char(&version, '\0');
         parse_db_version(ps, pigp, &dop->version, version.buf,
                          _("'%s' field, reference to '%.255s': "
                            "error in version"), fip->name, depname.buf);
@@ -483,7 +483,7 @@ scan_word(const char **valp)
 
   varbuf_reset(&word);
   varbufaddbuf(&word, start, end - start);
-  varbufaddc(&word, '\0');
+  varbuf_add_char(&word, '\0');
 
   *valp = p;
 
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index 7291519c0..c969c2434 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -55,7 +55,7 @@ LIBDPKG_PRIVATE {
 	varbuf_reset;
 	varbuf_grow;
 	varbuf_trunc;
-	varbufaddc;
+	varbuf_add_char;
 	varbuf_dup_char;
 	varbuf_map_char;
 	varbufaddbuf;
diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c
index 38d1becf5..497b5d009 100644
--- a/lib/dpkg/log.c
+++ b/lib/dpkg/log.c
@@ -62,7 +62,7 @@ log_message(const char *fmt, ...)
 	va_start(args, fmt);
 	varbuf_reset(&log);
 	varbufvprintf(&log, fmt, args);
-	varbufaddc(&log, 0);
+	varbuf_add_char(&log, '\0');
 	va_end(args);
 
 	time(&now);
@@ -107,7 +107,7 @@ statusfd_send(const char *fmt, ...)
 	/* Sanitize string to not include new lines, as front-ends should be
 	 * doing their own word-wrapping. */
 	varbuf_map_char(&vb, '\n', ' ');
-	varbufaddc(&vb, '\n');
+	varbuf_add_char(&vb, '\n');
 	va_end(args);
 
 	for (pipef = status_pipes; pipef; pipef = pipef->next) {
diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
index 023bf7c47..15ed97c9f 100644
--- a/lib/dpkg/parsehelp.c
+++ b/lib/dpkg/parsehelp.c
@@ -179,7 +179,7 @@ void varbufversion
   }
   if (version->version) varbufaddstr(vb,version->version);
   if (version->revision && *version->revision) {
-    varbufaddc(vb,'-');
+    varbuf_add_char(vb, '-');
     varbufaddstr(vb,version->revision);
   }
 }
@@ -199,7 +199,7 @@ const char *versiondescribe
   vb= &bufs[bufnum]; bufnum++; if (bufnum == 10) bufnum= 0;
   varbuf_reset(vb);
   varbufversion(vb,version,vdew);
-  varbufaddc(vb,0);
+  varbuf_add_char(vb, '\0');
 
   return vb->buf;
 }
diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c
index fda0690ca..b47e80aac 100644
--- a/lib/dpkg/pkg-format.c
+++ b/lib/dpkg/pkg-format.c
@@ -228,7 +228,7 @@ pkg_format_show(const struct pkg_format_node *head,
 				if (strcasecmp(head->data, fip->name) == 0) {
 					fip->wcall(&wb, pkg, pif, 0, fip);
 
-					varbufaddc(&wb, '\0');
+					varbuf_add_char(&wb, '\0');
 					varbufprintf(&fb, fmt, wb.buf);
 					varbuf_reset(&wb);
 					ok = true;
@@ -259,7 +259,7 @@ pkg_format_show(const struct pkg_format_node *head,
 	}
 
 	if (vb.buf) {
-		varbufaddc(&vb, '\0');
+		varbuf_add_char(&vb, '\0');
 		fputs(vb.buf, stdout);
 	}
 
diff --git a/lib/dpkg/test/t-varbuf.c b/lib/dpkg/test/t-varbuf.c
index 63381bd81..05b5ae7a1 100644
--- a/lib/dpkg/test/t-varbuf.c
+++ b/lib/dpkg/test/t-varbuf.c
@@ -138,22 +138,22 @@ test_varbuf_addc(void)
 
 	varbuf_init(&vb, 1);
 
-	varbufaddc(&vb, 'a');
+	varbuf_add_char(&vb, 'a');
 	test_pass(vb.used == 1);
 	test_pass(vb.size >= vb.used);
 	test_pass(vb.buf[0] == 'a');
 
-	varbufaddc(&vb, 'b');
+	varbuf_add_char(&vb, 'b');
 	test_pass(vb.used == 2);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "ab", 2);
 
-	varbufaddc(&vb, 'c');
+	varbuf_add_char(&vb, 'c');
 	test_pass(vb.used == 3);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "abc", 3);
 
-	varbufaddc(&vb, 'd');
+	varbuf_add_char(&vb, 'd');
 	test_pass(vb.used == 4);
 	test_pass(vb.size >= vb.used);
 	test_mem(vb.buf, ==, "abcd", 4);
@@ -207,7 +207,7 @@ test_varbuf_printf(void)
 
 	/* Test normal format printing. */
 	varbufprintf(&vb, "format %s number %d", "string", 10);
-	varbufaddc(&vb, '\0');
+	varbuf_add_char(&vb, '\0');
 	test_pass(vb.used == sizeof("format string number 10"));
 	test_pass(vb.size >= vb.used);
 	test_str(vb.buf, ==, "format string number 10");
@@ -217,7 +217,7 @@ test_varbuf_printf(void)
 	/* Test concatenated format printing. */
 	varbufprintf(&vb, "format %s number %d", "string", 10);
 	varbufprintf(&vb, " extra %s", "string");
-	varbufaddc(&vb, '\0');
+	varbuf_add_char(&vb, '\0');
 	test_pass(vb.used == sizeof("format string number 10 extra string"));
 	test_pass(vb.size >= vb.used);
 	test_str(vb.buf, ==, "format string number 10 extra string");
diff --git a/lib/dpkg/trigdeferred.l b/lib/dpkg/trigdeferred.l
index 9f991a49b..594df7ac1 100644
--- a/lib/dpkg/trigdeferred.l
+++ b/lib/dpkg/trigdeferred.l
@@ -102,7 +102,7 @@ constructfn(struct varbuf *vb, const char *dir, const char *tail)
 	varbuf_reset(vb);
 	varbufaddstr(vb, dir);
 	varbufaddstr(vb, tail);
-	varbufaddc(vb, 0);
+	varbuf_add_char(vb, '\0');
 }
 
 /**
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index e3fa7eccb..5590e4ff0 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -365,7 +365,7 @@ trk_explicit_start(const char *trig)
 	varbuf_reset(&trk_explicit_fn);
 	varbufaddstr(&trk_explicit_fn, triggersdir);
 	varbufaddstr(&trk_explicit_fn, trig);
-	varbufaddc(&trk_explicit_fn, 0);
+	varbuf_add_char(&trk_explicit_fn, '\0');
 
 	trk_explicit_f = fopen(trk_explicit_fn.buf, "r");
 	if (!trk_explicit_f) {
@@ -423,7 +423,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);
-	varbufaddc(&newfn, 0);
+	varbuf_add_char(&newfn, '\0');
 
 	nf = fopen(newfn.buf, "w");
 	if (!nf)
diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c
index 1baa84024..f5c2df192 100644
--- a/lib/dpkg/varbuf.c
+++ b/lib/dpkg/varbuf.c
@@ -31,7 +31,7 @@
 #include <dpkg/dpkg-db.h>
 
 void
-varbufaddc(struct varbuf *v, int c)
+varbuf_add_char(struct varbuf *v, int c)
 {
   varbuf_grow(v, 1);
   v->buf[v->used++]= c;
diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h
index 0cd7b92b4..125c9e4ed 100644
--- a/lib/dpkg/varbuf.h
+++ b/lib/dpkg/varbuf.h
@@ -71,7 +71,7 @@ char *varbuf_detach(struct varbuf *v);
 void varbuf_reset(struct varbuf *v);
 void varbuf_destroy(struct varbuf *v);
 
-void varbufaddc(struct varbuf *v, int c);
+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 varbufaddstr(v, s) varbufaddbuf(v, s, strlen(s))
@@ -117,7 +117,7 @@ varbuf::destroy()
 inline void
 varbuf::operator()(int c)
 {
-	varbufaddc(this, c);
+	varbuf_add_char(this, c);
 }
 
 inline void
@@ -129,7 +129,7 @@ varbuf::operator()(const char *s)
 inline void
 varbuf::terminate(void/*to shut 2.6.3 up*/)
 {
-	varbufaddc(this, 0);
+	varbuf_add_char(this, '\0');
 	used--;
 }
 
diff --git a/src/archives.c b/src/archives.c
index 12e9a73fe..dfc8e4845 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -293,17 +293,17 @@ set_selinux_path_context(const char *matchpath, const char *path, mode_t mode)
 void setupfnamevbs(const char *filename) {
   varbuf_trunc(&fnamevb, fnameidlu);
   varbufaddstr(&fnamevb,filename);
-  varbufaddc(&fnamevb,0);
+  varbuf_add_char(&fnamevb, '\0');
 
   varbuf_trunc(&fnametmpvb, fnameidlu);
   varbufaddstr(&fnametmpvb,filename);
   varbufaddstr(&fnametmpvb,DPKGTEMPEXT);
-  varbufaddc(&fnametmpvb,0);
+  varbuf_add_char(&fnametmpvb, '\0');
 
   varbuf_trunc(&fnamenewvb, fnameidlu);
   varbufaddstr(&fnamenewvb,filename);
   varbufaddstr(&fnamenewvb,DPKGNEWEXT);
-  varbufaddc(&fnamenewvb,0);
+  varbuf_add_char(&fnamenewvb, '\0');
 
   debug(dbg_eachfiledetail, "setupvnamevbs main=`%s' tmp=`%s' new=`%s'",
         fnamevb.buf, fnametmpvb.buf, fnamenewvb.buf);
@@ -392,7 +392,7 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
     varbufaddbuf(symlinkfn, fname, (lastslash - fname) + 1);
   }
   varbufaddstr(symlinkfn, ti->linkname);
-  varbufaddc(symlinkfn, 0);
+  varbuf_add_char(symlinkfn, '\0');
 
   statr= stat(symlinkfn->buf, &newstab);
   if (statr) {
@@ -738,12 +738,13 @@ tarobject(void *ctx, struct tar_entry *ti)
     break;
   case tar_filetype_hardlink:
     varbuf_reset(&hardlinkfn);
-    varbufaddstr(&hardlinkfn,instdir); varbufaddc(&hardlinkfn,'/');
+    varbufaddstr(&hardlinkfn, instdir);
+    varbuf_add_char(&hardlinkfn, '/');
     varbufaddstr(&hardlinkfn, ti->linkname);
     linknode = findnamenode(ti->linkname, 0);
     if (linknode->flags & fnnf_deferred_rename)
       varbufaddstr(&hardlinkfn, DPKGNEWEXT);
-    varbufaddc(&hardlinkfn, '\0');
+    varbuf_add_char(&hardlinkfn, '\0');
     if (link(hardlinkfn.buf,fnamenewvb.buf))
       ohshite(_("error creating hard link `%.255s'"), ti->name);
     debug(dbg_eachfiledetail, "tarobject hardlink");
@@ -811,7 +812,7 @@ tarobject(void *ctx, struct tar_entry *ti)
         ohshite(_("unable to read link `%.255s'"), ti->name);
       assert(r == stab.st_size);
       varbuf_trunc(&symlinkfn, r);
-      varbufaddc(&symlinkfn, '\0');
+      varbuf_add_char(&symlinkfn, '\0');
       if (symlink(symlinkfn.buf,fnametmpvb.buf))
         ohshite(_("unable to make backup symlink for `%.255s'"), ti->name);
       if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
@@ -1019,7 +1020,7 @@ void check_breaks(struct dependency *dep, struct pkginfo *pkg,
     return;
   }
 
-  varbufaddc(&why, 0);
+  varbuf_add_char(&why, '\0');
 
   if (fixbydeconf && f_autodeconf) {
     char action[512];
@@ -1103,7 +1104,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
             continue;
           if (depisok(pdep->up, &removalwhy, NULL, false))
             continue;
-          varbufaddc(&removalwhy,0);
+          varbuf_add_char(&removalwhy, '\0');
           if (!try_remove_can(pdep,fixbyrm,removalwhy.buf))
             break;
         }
@@ -1120,7 +1121,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
                 continue;
               if (depisok(pdep->up, &removalwhy, NULL, false))
                 continue;
-              varbufaddc(&removalwhy,0);
+              varbuf_add_char(&removalwhy, '\0');
               fprintf(stderr, _("dpkg"
                       ": may have trouble removing %s, as it provides %s ...\n"),
                       fixbyrm->name, providecheck->list->ed->name);
@@ -1160,7 +1161,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
       fixbyrm->clientdata->istobe = itb_normal;
     }
   }
-  varbufaddc(&conflictwhy,0);
+  varbuf_add_char(&conflictwhy, '\0');
   fprintf(stderr, _("dpkg: regarding %s containing %s:\n%s"),
           pfilename, pkg->name, conflictwhy.buf);
   if (!force_conflicts(dep->list))
@@ -1240,7 +1241,7 @@ void archivefiles(const char *const *argv) {
     pf= fdopen(pi[0],"r");  if (!pf) ohshite(_("failed to fdopen find's pipe"));
     varbuf_reset(&findoutput);
     while ((c= fgetc(pf)) != EOF) {
-      varbufaddc(&findoutput,c);
+      varbuf_add_char(&findoutput, c);
       if (!c) nfiles++;
     }
     if (ferror(pf)) ohshite(_("error reading find's pipe"));
@@ -1252,8 +1253,8 @@ void archivefiles(const char *const *argv) {
     if (!nfiles)
       ohshit(_("searched, but found no packages (files matching *.deb)"));
 
-    varbufaddc(&findoutput,0);
-    varbufaddc(&findoutput,0);
+    varbuf_add_char(&findoutput, '\0');
+    varbuf_add_char(&findoutput, '\0');
 
     arglist= m_malloc(sizeof(char*)*(nfiles+1));
     p= findoutput.buf; i=0;
@@ -1277,9 +1278,12 @@ void archivefiles(const char *const *argv) {
   varbuf_reset(&fnametmpvb);
   varbuf_reset(&fnamenewvb);
 
-  varbufaddstr(&fnamevb,instdir); varbufaddc(&fnamevb,'/');
-  varbufaddstr(&fnametmpvb,instdir); varbufaddc(&fnametmpvb,'/');
-  varbufaddstr(&fnamenewvb,instdir); varbufaddc(&fnamenewvb,'/');
+  varbufaddstr(&fnamevb, instdir);
+  varbuf_add_char(&fnamevb, '/');
+  varbufaddstr(&fnametmpvb, instdir);
+  varbuf_add_char(&fnametmpvb, '/');
+  varbufaddstr(&fnamenewvb, instdir);
+  varbuf_add_char(&fnamenewvb, '/');
   fnameidlu= fnamevb.used;
 
   ensure_diversions();
diff --git a/src/configure.c b/src/configure.c
index d0a88db7a..065848394 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -88,7 +88,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 
 	varbuf_reset(&cdr2);
 	varbufaddstr(&cdr2, cdr.buf);
-	varbufaddc(&cdr2, 0);
+	varbuf_add_char(&cdr2, '\0');
 	/* XXX: Make sure there's enough room for extensions. */
 	varbuf_grow(&cdr2, 50);
 	cdr2rest = cdr2.buf + strlen(cdr.buf);
@@ -167,7 +167,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 			        pkg->name, cdr2.buf, strerror(errno));
 		cdr.used--;
 		varbufaddstr(&cdr, DPKGDISTEXT);
-		varbufaddc(&cdr, 0);
+		varbuf_add_char(&cdr, '\0');
 		strcpy(cdr2rest, DPKGNEWEXT);
 		trig_file_activate(usenode, pkg);
 		if (rename(cdr2.buf, cdr.buf))
@@ -287,14 +287,14 @@ deferred_configure(struct pkginfo *pkg)
 	ok = breakses_ok(pkg, &aemsgs) ? ok : 0;
 	if (ok == 0) {
 		sincenothing = 0;
-		varbufaddc(&aemsgs, 0);
+		varbuf_add_char(&aemsgs, '\0');
 		fprintf(stderr,
 		        _("dpkg: dependency problems prevent configuration of %s:\n%s"),
 		        pkg->name, aemsgs.buf);
 		varbuf_destroy(&aemsgs);
 		ohshit(_("dependency problems - leaving unconfigured"));
 	} else if (aemsgs.used) {
-		varbufaddc(&aemsgs, 0);
+		varbuf_add_char(&aemsgs, '\0');
 		fprintf(stderr,
 		        _("dpkg: %s: dependency problems, but configuring anyway as you requested:\n%s"),
 		        pkg->name, aemsgs.buf);
@@ -379,9 +379,9 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 	varbuf_reset(result);
 	varbufaddstr(result, instdir);
 	if (*in != '/')
-		varbufaddc(result, '/');
+		varbuf_add_char(result, '/');
 	varbufaddstr(result, in);
-	varbufaddc(result, 0);
+	varbuf_add_char(result, '\0');
 
 	loopprotect = 0;
 
@@ -419,7 +419,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 			}
 			assert(r == stab.st_size); /* XXX: debug */
 			varbuf_trunc(&target, r);
-			varbufaddc(&target, '\0');
+			varbuf_add_char(&target, '\0');
 
 			debug(dbg_conffdetail,
 			      "conffderef readlink gave %d, '%s'",
@@ -448,7 +448,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in)
 				      (int)result->used, result->buf);
 			}
 			varbufaddbuf(result, target.buf, target.used);
-			varbufaddc(result, 0);
+			varbuf_add_char(result, '\0');
 		} else {
 			warning(_("%s: conffile '%.250s' is not a plain file or symlink (= '%s')"),
 			        pkg->name, in, result->buf);
diff --git a/src/depcon.c b/src/depcon.c
index ed4ee6dd1..75aa15097 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -117,7 +117,7 @@ findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *sofar)
       varbufaddstr(&str_pkgs, " <- ");
       varbufaddstr(&str_pkgs, sol->pkg->name);
     }
-    varbufaddc(&str_pkgs, '\0');
+    varbuf_add_char(&str_pkgs, '\0');
     debug(dbg_depcondetail, "findbreakcyclerecursive %s %s", pkg->name,
           str_pkgs.buf);
     varbuf_destroy(&str_pkgs);
@@ -199,7 +199,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
   }
 
   varbufdependency(&depstr, dep);
-  varbufaddc(&depstr, 0);
+  varbuf_add_char(&depstr, '\0');
 
   varbufprintf(addto, fmt, dep->up->name, depstr.buf);
   varbuf_destroy(&depstr);
@@ -272,9 +272,9 @@ depisok(struct dependency *dep, struct varbuf *whynot,
 
   /* Describe the dependency, in case we have to moan about it. */
   varbuf_reset(whynot);
-  varbufaddc(whynot, ' ');
+  varbuf_add_char(whynot, ' ');
   describedepcon(whynot, dep);
-  varbufaddc(whynot,'\n');
+  varbuf_add_char(whynot, '\n');
 
   /* TODO: Check dep_enhances as well. */
   if (dep->type == dep_depends || dep->type == dep_predepends ||
diff --git a/src/divertdb.c b/src/divertdb.c
index 62ed892b1..69c1c351f 100644
--- a/src/divertdb.c
+++ b/src/divertdb.c
@@ -56,7 +56,7 @@ ensure_diversions(void)
 	varbuf_reset(&vb);
 	varbufaddstr(&vb, admindir);
 	varbufaddstr(&vb, "/" DIVERSIONSFILE);
-	varbufaddc(&vb, 0);
+	varbuf_add_char(&vb, '\0');
 
 	onerr_abort++;
 
diff --git a/src/enquiry.c b/src/enquiry.c
index 489ea05c7..1594f54b1 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -406,7 +406,7 @@ void predeppackage(const char *const *argv) {
     if (!pkg) {
       varbuf_reset(&vb);
       describedepcon(&vb,dep);
-      varbufaddc(&vb,0);
+      varbuf_add_char(&vb, '\0');
       fprintf(stderr, _("dpkg: cannot see how to satisfy pre-dependency:\n %s\n"),vb.buf);
       ohshit(_("cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"),
              dep->up->name,startpkg->name);
diff --git a/src/filesdb.c b/src/filesdb.c
index aa8dd16f9..2c6195e73 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -468,12 +468,12 @@ write_filelist_except(struct pkginfo *pkg, struct fileinlist *list,
   varbufaddstr(&vb, pkgadmindir());
   varbufaddstr(&vb,pkg->name);
   varbufaddstr(&vb,"." LISTFILE);
-  varbufaddc(&vb,0);
+  varbuf_add_char(&vb, '\0');
 
   varbuf_reset(&newvb);
   varbufaddstr(&newvb,vb.buf);
   varbufaddstr(&newvb,NEWDBEXT);
-  varbufaddc(&newvb,0);
+  varbuf_add_char(&newvb, '\0');
 
   file= fopen(newvb.buf,"w+");
   if (!file)
diff --git a/src/help.c b/src/help.c
index 4b3c6f3b9..81e645730 100644
--- a/src/help.c
+++ b/src/help.c
@@ -118,9 +118,9 @@ void checkpath(void) {
       varbuf_reset(&filename);
       varbufaddbuf(&filename, path, path_len);
       if (path_len)
-        varbufaddc(&filename, '/');
+        varbuf_add_char(&filename, '/');
       varbufaddstr(&filename, *prog);
-      varbufaddc(&filename, '\0');
+      varbuf_add_char(&filename, '\0');
 
       if (stat(filename.buf, &stab) == 0 && (stab.st_mode & 0111))
         break;
@@ -195,10 +195,10 @@ preexecscript(struct command *cmd)
     const char **argv = cmd->argv;
 
     while (*++argv) {
-      varbufaddc(&args, ' ');
+      varbuf_add_char(&args, ' ');
       varbufaddstr(&args, *argv);
     }
-    varbufaddc(&args, '\0');
+    varbuf_add_char(&args, '\0');
     debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, args.buf);
     varbuf_destroy(&args);
   }
diff --git a/src/main.c b/src/main.c
index b74073d66..f5632faa5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -630,7 +630,7 @@ void commandfd(const char *const *argv) {
     }
     varbuf_reset(&linevb);
     do {
-      varbufaddc(&linevb,c);
+      varbuf_add_char(&linevb, c);
       c= getc(in);
       if (c == '\n') lno++;
 
@@ -640,7 +640,7 @@ void commandfd(const char *const *argv) {
     } while (c != EOF && c != '\n');
     if (c == EOF) ohshit(_("unexpected eof before end of line %d"),lno);
     if (!argc) continue;
-    varbufaddc(&linevb,0);
+    varbuf_add_char(&linevb, '\0');
     newargs = m_realloc(newargs, sizeof(const char *) * (argc + 1));
     argc= 1;
     ptr= linevb.buf;
diff --git a/src/packages.c b/src/packages.c
index a044b4043..c25b49fe4 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -467,7 +467,7 @@ breaks_check_one(struct varbuf *aemsgs, enum dep_check *ok,
   if (virtbroken && ignore_depends(virtbroken)) return;
 
   varbufdependency(&depmsg, breaks->up);
-  varbufaddc(&depmsg, 0);
+  varbuf_add_char(&depmsg, '\0');
   varbufprintf(aemsgs, _(" %s (%s) breaks %s and is %s.\n"),
                breaker->name,
                versiondescribe(&breaker->installed.version, vdew_nonambig),
@@ -601,7 +601,7 @@ dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
         /* Don't print the line about the package to be removed if
          * that's the only line. */
         varbufaddstr(aemsgs, _("; however:\n"));
-        varbufaddc(&oemsgs, 0);
+        varbuf_add_char(&oemsgs, '\0');
         varbufaddstr(aemsgs, oemsgs.buf);
       } else {
         varbufaddstr(aemsgs, ".\n");
diff --git a/src/processarc.c b/src/processarc.c
index 13ab6b631..adb967b8c 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -312,7 +312,7 @@ void process_archive(const char *filename) {
       break;
     case dep_predepends:
       if (!depisok(dsearch, &depprobwhy, NULL, true)) {
-        varbufaddc(&depprobwhy,0);
+        varbuf_add_char(&depprobwhy, '\0');
         fprintf(stderr, _("dpkg: regarding %s containing %s, pre-dependency problem:\n%s"),
                 pfilename, pkg->name, depprobwhy.buf);
         if (!force_depends(dsearch->list))
@@ -691,7 +691,7 @@ void process_archive(const char *filename) {
 
     varbuf_trunc(&fnamevb, fnameidlu);
     varbufaddstr(&fnamevb, usenode->name);
-    varbufaddc(&fnamevb,0);
+    varbuf_add_char(&fnamevb, '\0');
 
     if (!stat(namenode->name,&stab) && S_ISDIR(stab.st_mode)) {
       debug(dbg_eachfiledetail, "process_archive: %s is a directory",
@@ -748,9 +748,9 @@ void process_archive(const char *filename) {
 
 	  varbuf_reset(&cfilename);
 	  varbufaddstr(&cfilename, instdir);
-	  varbufaddc(&cfilename, '/');
+	  varbuf_add_char(&cfilename, '/');
 	  varbufaddstr(&cfilename, cfile->namenode->name);
-	  varbufaddc(&cfilename, '\0');
+	  varbuf_add_char(&cfilename, '\0');
 
 	  if (lstat(cfilename.buf, &tmp_stat) == 0) {
 	    cfile->namenode->filestat = nfmalloc(sizeof(struct stat));
@@ -836,7 +836,7 @@ void process_archive(const char *filename) {
   varbuf_reset(&infofnvb);
   varbufaddstr(&infofnvb, pkgadmindir());
   infodirlen= infofnvb.used;
-  varbufaddc(&infofnvb,0);
+  varbuf_add_char(&infofnvb, '\0');
   dsd= opendir(infofnvb.buf);
   if (!dsd) ohshite(_("cannot read info directory"));
   push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd);
@@ -865,7 +865,7 @@ void process_archive(const char *filename) {
              de->d_name);
     varbuf_trunc(&infofnvb, infodirlen);
     varbufaddstr(&infofnvb,de->d_name);
-    varbufaddc(&infofnvb,0);
+    varbuf_add_char(&infofnvb, '\0');
     strcpy(cidirrest,p);
 
     /* We keep files to rename in a list as doing the rename immediately
@@ -1067,7 +1067,7 @@ void process_archive(const char *filename) {
           pdep->up->type != dep_recommends) continue;
       if (depisok(pdep->up, &depprobwhy, NULL, false))
         continue;
-      varbufaddc(&depprobwhy,0);
+      varbuf_add_char(&depprobwhy, '\0');
       debug(dbg_veryverbose,"process_archive cannot disappear: %s",depprobwhy.buf);
       break;
     }
@@ -1085,7 +1085,7 @@ void process_archive(const char *filename) {
             continue;
           if (depisok(pdep->up, &depprobwhy, NULL, false))
             continue;
-          varbufaddc(&depprobwhy,0);
+          varbuf_add_char(&depprobwhy, '\0');
           debug(dbg_veryverbose,"process_archive cannot disappear (provides %s): %s",
                 providecheck->list->ed->name, depprobwhy.buf);
           goto break_from_both_loops_at_once;
@@ -1115,7 +1115,7 @@ void process_archive(const char *filename) {
     varbuf_reset(&fnvb);
     varbufaddstr(&fnvb, pkgadmindir());
     infodirbaseused= fnvb.used;
-    varbufaddc(&fnvb,0);
+    varbuf_add_char(&fnvb, '\0');
     dsd= opendir(fnvb.buf); if (!dsd) ohshite(_("cannot read info directory"));
     push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd);
 
@@ -1130,7 +1130,7 @@ void process_archive(const char *filename) {
       debug(dbg_stupidlyverbose, "process_archive info this pkg");
       varbuf_trunc(&fnvb, infodirbaseused);
       varbufaddstr(&fnvb,de->d_name);
-      varbufaddc(&fnvb,0);
+      varbuf_add_char(&fnvb, '\0');
       if (unlink(fnvb.buf))
         ohshite(_("unable to delete disappearing control info file `%.250s'"),fnvb.buf);
       debug(dbg_scripts, "process_archive info unlinked %s",fnvb.buf);
@@ -1226,7 +1226,7 @@ void process_archive(const char *filename) {
     varbuf_trunc(&fnametmpvb, fnameidlu);
     varbufaddstr(&fnametmpvb,namenodetouse(cfile->namenode,pkg)->name);
     varbufaddstr(&fnametmpvb,DPKGTEMPEXT);
-    varbufaddc(&fnametmpvb,0);
+    varbuf_add_char(&fnametmpvb, '\0');
     ensure_pathname_nonexisting(fnametmpvb.buf);
   }
 
diff --git a/src/querycmd.c b/src/querycmd.c
index 73486d8fc..2190a6eb5 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -313,7 +313,7 @@ searchfiles(const char *const *argv)
     if (!strpbrk(thisarg, "*[?\\")) {
       varbuf_reset(&path);
       varbufaddstr(&path, thisarg);
-      varbufaddc(&path, '\0');
+      varbuf_add_char(&path, '\0');
 
       varbuf_trunc(&path, path_trim_slash_slashdot(path.buf));
 
@@ -322,10 +322,10 @@ searchfiles(const char *const *argv)
 
     if (!strchr("*[?/",*thisarg)) {
       varbuf_reset(&vb);
-      varbufaddc(&vb,'*');
+      varbuf_add_char(&vb, '*');
       varbufaddstr(&vb,thisarg);
-      varbufaddc(&vb,'*');
-      varbufaddc(&vb,0);
+      varbuf_add_char(&vb, '*');
+      varbuf_add_char(&vb, '\0');
       thisarg= vb.buf;
     }
     if (!strpbrk(thisarg, "*[?\\")) {
@@ -547,7 +547,7 @@ control_path_pkg(struct pkginfo *pkg)
   varbuf_init(&db_path, 0);
   varbufaddstr(&db_path, pkgadmindir());
   db_path_len = db_path.used;
-  varbufaddc(&db_path, '\0');
+  varbuf_add_char(&db_path, '\0');
 
   db_dir = opendir(db_path.buf);
   if (!db_dir)
@@ -584,7 +584,7 @@ control_path_pkg(struct pkginfo *pkg)
 
     varbuf_trunc(&db_path, db_path_len);
     varbufaddstr(&db_path, db_de->d_name);
-    varbufaddc(&db_path, '\0');
+    varbuf_add_char(&db_path, '\0');
 
     printf("%s\n", db_path.buf);
   }
diff --git a/src/remove.c b/src/remove.c
index b9e996175..3104a434f 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -122,13 +122,13 @@ void deferred_remove(struct pkginfo *pkg) {
     return;
   } else if (rok == 0) {
     sincenothing= 0;
-    varbufaddc(&raemsgs,0);
+    varbuf_add_char(&raemsgs, '\0');
     fprintf(stderr,
             _("dpkg: dependency problems prevent removal of %s:\n%s"),
             pkg->name, raemsgs.buf);
     ohshit(_("dependency problems - not removing"));
   } else if (raemsgs.used) {
-    varbufaddc(&raemsgs,0);
+    varbuf_add_char(&raemsgs, '\0');
     fprintf(stderr,
             _("dpkg: %s: dependency problems, but removing anyway as you requested:\n%s"),
             pkg->name, raemsgs.buf);
@@ -222,19 +222,19 @@ static void removal_bulk_remove_files(
       before= fnvb.used;
 
       varbufaddstr(&fnvb,DPKGTEMPEXT);
-      varbufaddc(&fnvb,0);
+      varbuf_add_char(&fnvb, '\0');
       debug(dbg_eachfiledetail, "removal_bulk cleaning temp `%s'", fnvb.buf);
 
       ensure_pathname_nonexisting(fnvb.buf);
 
       varbuf_trunc(&fnvb, before);
       varbufaddstr(&fnvb,DPKGNEWEXT);
-      varbufaddc(&fnvb,0);
+      varbuf_add_char(&fnvb, '\0');
       debug(dbg_eachfiledetail, "removal_bulk cleaning new `%s'", fnvb.buf);
       ensure_pathname_nonexisting(fnvb.buf);
 
       varbuf_trunc(&fnvb, before);
-      varbufaddc(&fnvb,0);
+      varbuf_add_char(&fnvb, '\0');
       if (!stat(fnvb.buf,&stab) && S_ISDIR(stab.st_mode)) {
         debug(dbg_eachfiledetail, "removal_bulk is a directory");
         /* Only delete a directory or a link to one if we're the only
@@ -271,7 +271,7 @@ static void removal_bulk_remove_files(
     varbuf_reset(&fnvb);
     varbufaddstr(&fnvb, pkgadmindir());
     infodirbaseused= fnvb.used;
-    varbufaddc(&fnvb,0);
+    varbuf_add_char(&fnvb, '\0');
     dsd= opendir(fnvb.buf); if (!dsd) ohshite(_("cannot read info directory"));
     push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd);
     *out_foundpostrm = false;
@@ -296,7 +296,7 @@ static void removal_bulk_remove_files(
       debug(dbg_stupidlyverbose, "removal_bulk info not postrm or list");
       varbuf_trunc(&fnvb, infodirbaseused);
       varbufaddstr(&fnvb,de->d_name);
-      varbufaddc(&fnvb,0);
+      varbuf_add_char(&fnvb, '\0');
       if (unlink(fnvb.buf))
         ohshite(_("unable to delete control info file `%.250s'"),fnvb.buf);
       debug(dbg_scripts, "removal_bulk info unlinked %s",fnvb.buf);
@@ -341,7 +341,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
     varbuf_reset(&fnvb);
     varbufaddstr(&fnvb,instdir);
     varbufaddstr(&fnvb, usenode->name);
-    varbufaddc(&fnvb,0);
+    varbuf_add_char(&fnvb, '\0');
 
     if (!stat(fnvb.buf,&stab) && S_ISDIR(stab.st_mode)) {
       debug(dbg_eachfiledetail, "removal_bulk is a directory");
@@ -448,9 +448,9 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
       *p = '\0';
       varbuf_reset(&removevb);
       varbufaddstr(&removevb,fnvb.buf);
-      varbufaddc(&removevb,'/');
+      varbuf_add_char(&removevb, '/');
       removevbbase= removevb.used;
-      varbufaddc(&removevb,0);
+      varbuf_add_char(&removevb, '\0');
       dsd= opendir(removevb.buf);
       if (!dsd) {
         int e=errno;
@@ -488,7 +488,8 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
         continue;
       yes_remove:
         varbuf_trunc(&removevb, removevbbase);
-        varbufaddstr(&removevb,de->d_name); varbufaddc(&removevb,0);
+        varbufaddstr(&removevb, de->d_name);
+        varbuf_add_char(&removevb, '\0');
         debug(dbg_conffdetail, "removal_bulk conffile dsd entry removing `%s'",
               removevb.buf);
         if (unlink(removevb.buf) && errno != ENOENT && errno != ENOTDIR)
@@ -561,13 +562,13 @@ void removal_bulk(struct pkginfo *pkg) {
     pkgnameused= fnvb.used;
 
     varbufaddstr(&fnvb,"." LISTFILE);
-    varbufaddc(&fnvb,0);
+    varbuf_add_char(&fnvb, '\0');
     debug(dbg_general, "removal_bulk purge done, removing list `%s'",fnvb.buf);
     if (unlink(fnvb.buf) && errno != ENOENT) ohshite(_("cannot remove old files list"));
 
     varbuf_trunc(&fnvb, pkgnameused);
     varbufaddstr(&fnvb,"." POSTRMFILE);
-    varbufaddc(&fnvb,0);
+    varbuf_add_char(&fnvb, '\0');
     debug(dbg_general, "removal_bulk purge done, removing postrm `%s'",fnvb.buf);
     if (unlink(fnvb.buf) && errno != ENOENT) ohshite(_("can't remove old postrm script"));
 
diff --git a/src/select.c b/src/select.c
index 490ab276e..f1a789dce 100644
--- a/src/select.c
+++ b/src/select.c
@@ -104,7 +104,7 @@ void setselections(const char *const *argv) {
       continue;
     }
     while (!isspace(c)) {
-      varbufaddc(&namevb,c);
+      varbuf_add_char(&namevb, c);
       c= getchar();
       if (c == EOF) ohshit(_("unexpected eof in package name at line %d"),lno);
       if (c == '\n') ohshit(_("unexpected end of line in package name at line %d"),lno);
@@ -115,7 +115,7 @@ void setselections(const char *const *argv) {
       if (c == '\n') ohshit(_("unexpected end of line after package name at line %d"),lno);
     }
     while (c != EOF && !isspace(c)) {
-      varbufaddc(&selvb,c);
+      varbuf_add_char(&selvb, c);
       c= getchar();
     }
     while (c != EOF && c != '\n') {
@@ -123,8 +123,8 @@ void setselections(const char *const *argv) {
       if (!isspace(c))
         ohshit(_("unexpected data after package and selection at line %d"),lno);
     }
-    varbufaddc(&namevb,0);
-    varbufaddc(&selvb,0);
+    varbuf_add_char(&namevb, '\0');
+    varbuf_add_char(&selvb, '\0');
     e = pkg_name_is_illegal(namevb.buf, NULL);
     if (e) ohshit(_("illegal package name at line %d: %.250s"),lno,e);
 
diff --git a/src/statcmd.c b/src/statcmd.c
index 68785892a..6742de5fd 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -201,15 +201,15 @@ statdb_write(void)
 
 	varbufaddstr(&dbname, admindir);
 	varbufaddstr(&dbname, "/" STATOVERRIDEFILE);
-	varbufaddc(&dbname, '\0');
+	varbuf_add_char(&dbname, '\0');
 
 	varbufaddstr(&dbname_new, dbname.buf);
 	varbufaddstr(&dbname_new, NEWDBEXT);
-	varbufaddc(&dbname_new, '\0');
+	varbuf_add_char(&dbname_new, '\0');
 
 	varbufaddstr(&dbname_old, dbname.buf);
 	varbufaddstr(&dbname_old, OLDDBEXT);
-	varbufaddc(&dbname_old, '\0');
+	varbuf_add_char(&dbname_old, '\0');
 
 	dbfile = fopen(dbname_new.buf, "w");
 	if (!dbfile)
diff --git a/src/statdb.c b/src/statdb.c
index 624b32387..8b9dc1dc6 100644
--- a/src/statdb.c
+++ b/src/statdb.c
@@ -119,7 +119,7 @@ ensure_statoverrides(void)
 	varbuf_reset(&vb);
 	varbufaddstr(&vb, admindir);
 	varbufaddstr(&vb, "/" STATOVERRIDEFILE);
-	varbufaddc(&vb, 0);
+	varbuf_add_char(&vb, '\0');
 
 	onerr_abort++;
 
diff --git a/src/trigproc.c b/src/trigproc.c
index bd659a8e6..5dfb605a1 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -314,10 +314,10 @@ trigproc(struct pkginfo *pkg)
 
 		varbuf_reset(&namesarg);
 		for (tp = pkg->trigpend_head; tp; tp = tp->next) {
-			varbufaddc(&namesarg, ' ');
+			varbuf_add_char(&namesarg, ' ');
 			varbufaddstr(&namesarg, tp->name);
 		}
-		varbufaddc(&namesarg, 0);
+		varbuf_add_char(&namesarg, '\0');
 
 		/* Setting the status to half-configured
 		 * causes modstatdb_note to clear pending triggers. */
diff --git a/src/update.c b/src/update.c
index 3020ea400..3a712f2a9 100644
--- a/src/update.c
+++ b/src/update.c
@@ -76,7 +76,7 @@ void updateavailable(const char *const *argv) {
 
   varbufaddstr(&vb,admindir);
   varbufaddstr(&vb,"/" AVAILFILE);
-  varbufaddc(&vb,0);
+  varbuf_add_char(&vb, '\0');
 
   if (cipaction->arg == act_avmerge)
     parsedb(vb.buf, pdb_recordavailable | pdb_rejectstatus | pdb_lax_parser,