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=b4e679bf0261cc50fe2d9e9d95c967017b4f4fbc commit b4e679bf0261cc50fe2d9e9d95c967017b4f4fbc Author: Guillem Jover <[email protected]> AuthorDate: Wed Jul 12 05:14:54 2023 +0200 Use varbuf_set_*() instead of ad-hoc initialization Instead of using an explicit varbuf_reset() followed by varbuf_add_*() and possible varbuf_end_str(), just use a single varbuf_set_*() to initialize the varbuf. Changelog: internal --- lib/dpkg/db-ctrl-upgrade.c | 7 ++----- lib/dpkg/fields.c | 16 ++++------------ lib/dpkg/log.c | 3 +-- lib/dpkg/parse.c | 4 +--- lib/dpkg/t/t-varbuf.c | 5 ++--- src/main/archives.c | 8 +++----- src/main/configure.c | 10 +++------- src/main/help.c | 3 +-- src/main/remove.c | 6 ++---- src/main/unpack.c | 8 ++------ src/main/verify.c | 3 +-- src/query/main.c | 4 +--- 12 files changed, 23 insertions(+), 54 deletions(-) diff --git a/lib/dpkg/db-ctrl-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c index 82e0bc67f..86f584b07 100644 --- a/lib/dpkg/db-ctrl-upgrade.c +++ b/lib/dpkg/db-ctrl-upgrade.c @@ -84,8 +84,7 @@ pkg_infodb_link_multiarch_files(void) varbuf_end_str(&oldname); varbuf_snapshot(&oldname, &oldname_state); - varbuf_add_buf(&newname, oldname.buf, oldname.used); - varbuf_end_str(&newname); + varbuf_set_varbuf(&newname, &oldname); varbuf_snapshot(&newname, &newname_state); db_dir = opendir(pkg_infodb_get_dir()); @@ -107,9 +106,7 @@ pkg_infodb_link_multiarch_files(void) if (dot == NULL) continue; - varbuf_reset(&pkgname); - varbuf_add_buf(&pkgname, db_de->d_name, dot - db_de->d_name); - varbuf_end_str(&pkgname); + varbuf_set_buf(&pkgname, db_de->d_name, dot - db_de->d_name); /* Skip files already converted. */ if (strchr(pkgname.buf, ':')) diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 04127512b..471e6e02e 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -461,9 +461,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, _("'%s' field, missing package name, or garbage where " "package name expected"), fip->name); - varbuf_reset(&depname); - varbuf_add_buf(&depname, depnamestart, depnamelength); - varbuf_end_str(&depname); + varbuf_set_buf(&depname, depnamestart, depnamelength); emsg = pkg_name_is_illegal(depname.buf); if (emsg) @@ -500,9 +498,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, parse_error(ps, _("'%s' field, missing architecture name, or garbage " "where architecture name expected"), fip->name); - varbuf_reset(&arch); - varbuf_add_buf(&arch, archstart, archlength); - varbuf_end_str(&arch); + varbuf_set_buf(&arch, archstart, archlength); dop->arch_is_implicit = false; dop->arch = dpkg_arch_find(arch.buf); @@ -609,9 +605,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, _("'%s' field, reference to '%.255s': " "version contains '%c' instead of '%c'"), fip->name, depname.buf, *p, ')'); - varbuf_reset(&version); - varbuf_add_buf(&version, versionstart, versionlength); - varbuf_end_str(&version); + varbuf_set_buf(&version, versionstart, versionlength); if (parse_db_version(ps, &dop->version, version.buf) < 0) parse_problem(ps, _("'%s' field, reference to '%.255s': version '%s'"), @@ -682,9 +676,7 @@ scan_word(const char **valp) break; } - varbuf_reset(&word); - varbuf_add_buf(&word, start, end - start); - varbuf_end_str(&word); + varbuf_set_buf(&word, start, end - start); *valp = p; diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c index 7c12de1cf..10a33a2a0 100644 --- a/lib/dpkg/log.c +++ b/lib/dpkg/log.c @@ -70,8 +70,7 @@ log_message(const char *fmt, ...) strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S", &tm); va_start(args, fmt); - varbuf_reset(&log); - varbuf_add_str(&log, time_str); + varbuf_set_str(&log, time_str); varbuf_add_char(&log, ' '); varbuf_vprintf(&log, fmt, args); varbuf_add_char(&log, '\n'); diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 9baa3f1ca..a28983e74 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -127,9 +127,7 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs, parse_error(ps, _("duplicate value for '%s' field"), fip->name); - varbuf_reset(&fs->value); - varbuf_add_buf(&fs->value, fs->valuestart, fs->valuelen); - varbuf_end_str(&fs->value); + varbuf_set_buf(&fs->value, fs->valuestart, fs->valuelen); fip->rcall(pkg_obj->pkg, pkg_obj->pkgbin, ps, fs->value.buf, fip); } else { diff --git a/lib/dpkg/t/t-varbuf.c b/lib/dpkg/t/t-varbuf.c index 05b066cfc..08998a5a5 100644 --- a/lib/dpkg/t/t-varbuf.c +++ b/lib/dpkg/t/t-varbuf.c @@ -194,14 +194,13 @@ test_varbuf_add_varbuf(void) varbuf_init(&vb, 5); varbuf_init(&cb, 0); - varbuf_add_str(&vb, "1234567890"); + varbuf_set_str(&vb, "1234567890"); varbuf_add_varbuf(&cb, &vb); test_pass(cb.used == 10); test_pass(cb.size >= cb.used); test_mem(cb.buf, ==, "1234567890", 10); - varbuf_reset(&vb); - varbuf_add_str(&vb, "abcde"); + varbuf_set_str(&vb, "abcde"); varbuf_add_varbuf(&cb, &vb); test_pass(cb.used == 15); test_pass(cb.size >= cb.used); diff --git a/src/main/archives.c b/src/main/archives.c index 650b585cd..7c15143ee 100644 --- a/src/main/archives.c +++ b/src/main/archives.c @@ -421,8 +421,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te, debug(dbg_eachfiledetail, "tarobject blockdev"); break; case TAR_FILETYPE_HARDLINK: - varbuf_reset(&hardlinkfn); - varbuf_add_str(&hardlinkfn, dpkg_fsys_get_dir()); + varbuf_set_str(&hardlinkfn, dpkg_fsys_get_dir()); linknode = fsys_hash_find_node(te->linkname, 0); varbuf_add_str(&hardlinkfn, namenodetouse(linknode, tc->pkg, &tc->pkg->available)->name); @@ -632,16 +631,15 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname, return false; /* But is it to the same dir? */ - varbuf_reset(symlinkfn); if (ti->linkname[0] == '/') { - varbuf_add_str(symlinkfn, dpkg_fsys_get_dir()); + varbuf_set_str(symlinkfn, dpkg_fsys_get_dir()); } else { const char *lastslash; lastslash= strrchr(fname, '/'); if (lastslash == NULL) internerr("tar entry filename '%s' does not contain '/'", fname); - varbuf_add_buf(symlinkfn, fname, (lastslash - fname) + 1); + varbuf_set_buf(symlinkfn, fname, (lastslash - fname) + 1); } varbuf_add_str(symlinkfn, ti->linkname); varbuf_end_str(symlinkfn); diff --git a/src/main/configure.c b/src/main/configure.c index 60a18efcb..4512b8e42 100644 --- a/src/main/configure.c +++ b/src/main/configure.c @@ -393,9 +393,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff) } md5hash(pkg, currenthash, cdr.buf); - varbuf_reset(&cdr2); - varbuf_add_str(&cdr2, cdr.buf); - varbuf_end_str(&cdr2); + varbuf_set_varbuf(&cdr2, &cdr); /* XXX: Make sure there's enough room for extensions. */ varbuf_grow(&cdr2, 50); cdr2rest = cdr2.buf + strlen(cdr.buf); @@ -704,8 +702,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) ssize_t r; int loopprotect; - varbuf_reset(result); - varbuf_add_str(result, dpkg_fsys_get_dir()); + varbuf_set_str(result, dpkg_fsys_get_dir()); varbuf_add_str(result, in); varbuf_end_str(result); @@ -763,8 +760,7 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) r, target.buf); if (target.buf[0] == '/') { - varbuf_reset(result); - varbuf_add_str(result, dpkg_fsys_get_dir()); + varbuf_set_str(result, dpkg_fsys_get_dir()); debug(dbg_conffdetail, "conffderef readlink absolute"); } else { diff --git a/src/main/help.c b/src/main/help.c index b58e6a394..cfce1bbce 100644 --- a/src/main/help.c +++ b/src/main/help.c @@ -95,8 +95,7 @@ find_command(const char *prog) path_end = strchrnul(path, ':'); path_len = (size_t)(path_end - path); - varbuf_reset(&filename); - varbuf_add_buf(&filename, path, path_len); + varbuf_set_buf(&filename, path, path_len); if (path_len) varbuf_add_char(&filename, '/'); varbuf_add_str(&filename, prog); diff --git a/src/main/remove.c b/src/main/remove.c index 2cf651384..52acdeb02 100644 --- a/src/main/remove.c +++ b/src/main/remove.c @@ -288,8 +288,7 @@ removal_bulk_remove_files(struct pkginfo *pkg) usenode = namenodetouse(namenode, pkg, &pkg->installed); - varbuf_reset(&fnvb); - varbuf_add_str(&fnvb, dpkg_fsys_get_dir()); + varbuf_set_str(&fnvb, dpkg_fsys_get_dir()); varbuf_add_str(&fnvb, usenode->name); varbuf_end_str(&fnvb); varbuf_snapshot(&fnvb, &fnvb_state); @@ -418,8 +417,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) { usenode = namenodetouse(namenode, pkg, &pkg->installed); - varbuf_reset(&fnvb); - varbuf_add_str(&fnvb, dpkg_fsys_get_dir()); + varbuf_set_str(&fnvb, dpkg_fsys_get_dir()); varbuf_add_str(&fnvb, usenode->name); varbuf_end_str(&fnvb); diff --git a/src/main/unpack.c b/src/main/unpack.c index 9048f6fb0..be0a41765 100644 --- a/src/main/unpack.c +++ b/src/main/unpack.c @@ -614,10 +614,7 @@ pkg_remove_conffile_on_upgrade(struct pkginfo *pkg, struct fsys_namenode *nameno return; } - varbuf_reset(&cdrext); - varbuf_add_str(&cdrext, cdr.buf); - varbuf_end_str(&cdrext); - + varbuf_set_varbuf(&cdrext, &cdr); varbuf_snapshot(&cdrext, &cdrext_state); iter = fsys_node_pkgs_iter_new(namenode); @@ -775,8 +772,7 @@ pkg_remove_old_files(struct pkginfo *pkg, if (cfile->namenode->file_ondisk_id == NULL) { struct stat tmp_stat; - varbuf_reset(&cfilename); - varbuf_add_str(&cfilename, dpkg_fsys_get_dir()); + varbuf_set_str(&cfilename, dpkg_fsys_get_dir()); varbuf_add_str(&cfilename, cfile->namenode->name); varbuf_end_str(&cfilename); diff --git a/src/main/verify.c b/src/main/verify.c index 8abe09964..6a5d733e4 100644 --- a/src/main/verify.c +++ b/src/main/verify.c @@ -190,8 +190,7 @@ verify_package(struct pkginfo *pkg) fnn = namenodetouse(file->namenode, pkg, &pkg->installed); - varbuf_reset(&filename); - varbuf_add_str(&filename, dpkg_fsys_get_dir()); + varbuf_set_str(&filename, dpkg_fsys_get_dir()); varbuf_add_str(&filename, fnn->name); varbuf_end_str(&filename); diff --git a/src/query/main.c b/src/query/main.c index 24dccc8c4..91b980057 100644 --- a/src/query/main.c +++ b/src/query/main.c @@ -361,9 +361,7 @@ searchfiles(const char *const *argv) if (!strpbrk(thisarg, "*[?\\")) { /* Trim trailing ‘/’ and ‘/.’ from the argument if it is not * a pattern, just a pathname. */ - varbuf_reset(&path); - varbuf_add_str(&path, thisarg); - varbuf_end_str(&path); + varbuf_set_str(&path, thisarg); varbuf_trunc(&path, path_trim_slash_slashdot(path.buf)); namenode = fsys_hash_find_node(path.buf, 0); -- Dpkg.Org's dpkg
