summaryrefslogtreecommitdiff
path: root/src/configure.c
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2011-01-10 15:28:46 +0100
committerGuillem Jover <guillem@debian.org>2011-01-16 10:19:21 +0100
commit064d5f21ab0a97538b9a3d85056dd0c77e46ffba (patch)
tree21e9d95f4fd3866a540a2e282d2beef233d2cae5 /src/configure.c
parent559d66ec3f4a649e65cc87dc6bea708c9289c1ff (diff)
downloaddpkg-064d5f21ab0a97538b9a3d85056dd0c77e46ffba.tar.gz
libdpkg: Rename varbufaddc() to varbuf_add_char()
Make the varbuf API a bit more consistent.
Diffstat (limited to 'src/configure.c')
-rw-r--r--src/configure.c16
1 files changed, 8 insertions, 8 deletions
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);