This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=bdfd3133c7eff5d51a5543448c9df76f59b64c15 commit bdfd3133c7eff5d51a5543448c9df76f59b64c15 Author: Guillem Jover <[email protected]> AuthorDate: Mon Jul 22 20:17:52 2024 +0200 Replace varbuf_reset()+varbuf_*printf() with varbuf_set_*fmt() Changelog: internal --- lib/dpkg/log.c | 3 +-- lib/dpkg/parsehelp.c | 12 +++++------- src/deb/build.c | 6 ++---- src/deb/info.c | 9 +++------ src/divert/main.c | 22 +++++++++------------- src/split/split.c | 23 ++++++++++------------- 6 files changed, 30 insertions(+), 45 deletions(-) diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c index b416e2223..a32e60b31 100644 --- a/lib/dpkg/log.c +++ b/lib/dpkg/log.c @@ -112,8 +112,7 @@ statusfd_send(const char *fmt, ...) return; va_start(args, fmt); - varbuf_reset(&vb); - varbuf_vprintf(&vb, fmt, args); + varbuf_set_vfmt(&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', ' '); diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c index a999b5e78..f40519967 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c @@ -41,15 +41,13 @@ parse_error_msg(struct parsedb_state *ps, const char *fmt, va_list args) { struct varbuf *vb = &ps->errmsg; - varbuf_reset(vb); - if (ps->pkg && ps->pkg->set->name) - varbuf_printf(vb, _("parsing file '%s' near line %d package '%s':\n "), - ps->filename, ps->lno, - pkgbin_name(ps->pkg, ps->pkgbin, pnaw_nonambig)); + varbuf_set_fmt(vb, _("parsing file '%s' near line %d package '%s':\n "), + ps->filename, ps->lno, + pkgbin_name(ps->pkg, ps->pkgbin, pnaw_nonambig)); else - varbuf_printf(vb, _("parsing file '%.255s' near line %d:\n "), - ps->filename, ps->lno); + varbuf_set_fmt(vb, _("parsing file '%.255s' near line %d:\n "), + ps->filename, ps->lno); varbuf_vprintf(vb, fmt, args); diff --git a/src/deb/build.c b/src/deb/build.c index a309326b7..869fe5e16 100644 --- a/src/deb/build.c +++ b/src/deb/build.c @@ -223,8 +223,7 @@ check_ctrl_perms(const char *ctrldir) (unsigned long)(mscriptstab.st_mode & 07777)); for (mscriptp = maintainerscripts; *mscriptp; mscriptp++) { - varbuf_reset(&path); - varbuf_printf(&path, "%s/%s", ctrldir, *mscriptp); + varbuf_set_fmt(&path, "%s/%s", ctrldir, *mscriptp); if (!lstat(path.buf, &mscriptstab)) { if (S_ISLNK(mscriptstab.st_mode)) continue; @@ -321,8 +320,7 @@ check_conffiles(const char *ctrldir, const char *rootdir) ohshit(_("unknown flag '%s' for conffile '%s'"), flag, conffilename); } - varbuf_reset(&controlfile); - varbuf_printf(&controlfile, "%s%s", rootdir, conffilename); + varbuf_set_fmt(&controlfile, "%s%s", rootdir, conffilename); if (lstat(controlfile.buf, &controlstab)) { if (errno == ENOENT) { if ((n > 1) && c_isspace(conffilename[n - 1])) diff --git a/src/deb/info.c b/src/deb/info.c index afe79011f..f3d57e2ce 100644 --- a/src/deb/info.c +++ b/src/deb/info.c @@ -90,8 +90,7 @@ info_spew(const char *debar, const char *dir, const char *const *argv) while ((component = *argv++) != NULL) { int fd; - varbuf_reset(&controlfile); - varbuf_printf(&controlfile, "%s/%s", dir, component); + varbuf_set_fmt(&controlfile, "%s/%s", dir, component); fd = open(varbuf_str(&controlfile), O_RDONLY); if (fd >= 0) { @@ -169,8 +168,7 @@ info_list(const char *debar, const char *dir) cdep = cdlist[n]; - varbuf_reset(&controlfile); - varbuf_printf(&controlfile, "%s/%s", dir, cdep->d_name); + varbuf_set_fmt(&controlfile, "%s/%s", dir, cdep->d_name); if (stat(controlfile.buf, &stab)) ohshite(_("cannot get file '%.255s' metadata"), controlfile.buf); @@ -202,8 +200,7 @@ info_list(const char *debar, const char *dir) } free(cdlist); - varbuf_reset(&controlfile); - varbuf_printf(&controlfile, "%s/%s", dir, CONTROLFILE); + varbuf_set_fmt(&controlfile, "%s/%s", dir, CONTROLFILE); cc = fopen(controlfile.buf, "r"); if (!cc) { if (errno != ENOENT) diff --git a/src/divert/main.c b/src/divert/main.c index 0266abfa3..37f2ff2f9 100644 --- a/src/divert/main.c +++ b/src/divert/main.c @@ -311,21 +311,19 @@ static const char * varbuf_diversion(struct varbuf *str, const char *pkgname, const char *filename, const char *divertto) { - varbuf_reset(str); - if (pkgname == NULL) { if (divertto == NULL) - varbuf_printf(str, _("local diversion of %s"), filename); + varbuf_set_fmt(str, _("local diversion of %s"), filename); else - varbuf_printf(str, _("local diversion of %s to %s"), + varbuf_set_fmt(str, _("local diversion of %s to %s"), filename, divertto); } else { if (divertto == NULL) - varbuf_printf(str, _("diversion of %s by %s"), - filename, pkgname); + varbuf_set_fmt(str, _("diversion of %s by %s"), + filename, pkgname); else - varbuf_printf(str, _("diversion of %s to %s by %s"), - filename, divertto, pkgname); + varbuf_set_fmt(str, _("diversion of %s to %s by %s"), + filename, divertto, pkgname); } return varbuf_str(str); @@ -337,13 +335,11 @@ diversion_current(const char *filename) static struct varbuf str = VARBUF_INIT; if (opt_pkgname_match_any) { - varbuf_reset(&str); - if (opt_divertto == NULL) - varbuf_printf(&str, _("any diversion of %s"), filename); + varbuf_set_fmt(&str, _("any diversion of %s"), filename); else - varbuf_printf(&str, _("any diversion of %s to %s"), - filename, opt_divertto); + varbuf_set_fmt(&str, _("any diversion of %s to %s"), + filename, opt_divertto); } else { return varbuf_diversion(&str, opt_pkgname, filename, opt_divertto); } diff --git a/src/split/split.c b/src/split/split.c index d218ab747..b4d3aee5e 100644 --- a/src/split/split.c +++ b/src/split/split.c @@ -193,7 +193,6 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize, for (curpart = 1; curpart <= nparts; curpart++) { struct dpkg_ar *ar; - varbuf_reset(&file_dst); /* Generate output filename. */ if (msdos) { char *refname; @@ -201,12 +200,12 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize, refname = str_fmt("%dof%d", curpart, nparts); prefix_max = max(8 - strlen(refname), 0); - varbuf_printf(&file_dst, "%s/%.*s%.8s" DEBEXT, - prefixdir, prefix_max, prefix, refname); + varbuf_set_fmt(&file_dst, "%s/%.*s%.8s" DEBEXT, + prefixdir, prefix_max, prefix, refname); free(refname); } else { - varbuf_printf(&file_dst, "%s.%dof%d" DEBEXT, - prefix, curpart, nparts); + varbuf_set_fmt(&file_dst, "%s.%dof%d" DEBEXT, + prefix, curpart, nparts); } if (curpart == nparts) @@ -229,20 +228,18 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize, dpkg_ar_put_magic(ar); /* Write the debian-split part. */ - varbuf_printf(&partmagic, - "%s\n%s\n%s\n%s\n%jd\n%jd\n%d/%d\n%s\n", - SPLITVERSION, pkg->set->name, version, hash, - (intmax_t)st.st_size, (intmax_t)partsize, - curpart, nparts, pkg->available.arch->name); + varbuf_set_fmt(&partmagic, + "%s\n%s\n%s\n%s\n%jd\n%jd\n%d/%d\n%s\n", + SPLITVERSION, pkg->set->name, version, hash, + (intmax_t)st.st_size, (intmax_t)partsize, + curpart, nparts, pkg->available.arch->name); dpkg_ar_member_put_mem(ar, PARTMAGIC, partmagic.buf, partmagic.used); - varbuf_reset(&partmagic); /* Write the data part. */ - varbuf_printf(&partname, "data.%d", curpart); + varbuf_set_fmt(&partname, "data.%d", curpart); dpkg_ar_member_put_file(ar, partname.buf, fd_src, cur_partsize); - varbuf_reset(&partname); dpkg_ar_close(ar); -- Dpkg.Org's dpkg
