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=280cd974ade407b43f601089b0ff898b3926ca4b commit 280cd974ade407b43f601089b0ff898b3926ca4b Author: Guillem Jover <[email protected]> AuthorDate: Fri Jul 25 03:17:03 2025 +0200 dpkg: Switch from m_asprintf() to str_fmt() We are not interested in the number of characters read, so using str_fmt() is more ergonomic. Changelog: internal --- src/main/script.c | 17 +++++++++-------- src/main/verify.c | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/script.c b/src/main/script.c index e9aee0bf9..0c6f3f2d2 100644 --- a/src/main/script.c +++ b/src/main/script.c @@ -38,6 +38,7 @@ #include <dpkg/debug.h> #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> +#include <dpkg/string.h> #include <dpkg/pkg.h> #include <dpkg/subproc.h> #include <dpkg/command.h> @@ -222,8 +223,8 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname, char *buf; scriptpath = pkg_infodb_get_file(pkg, &pkg->installed, scriptname); - m_asprintf(&buf, _("installed %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + buf = str_fmt(_("installed %s package %s script"), + pkg_name(pkg, pnaw_nonambig), desc); command_init(&cmd, scriptpath, buf); command_add_arg(&cmd, scriptname); @@ -296,8 +297,8 @@ maintscript_new(struct pkginfo *pkg, const char *scriptname, char *buf; strcpy(cidirrest, scriptname); - m_asprintf(&buf, _("new %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + buf = str_fmt(_("new %s package %s script"), + pkg_name(pkg, pnaw_nonambig), desc); va_start(args, cidirrest); command_init(&cmd, cidir, buf); @@ -338,8 +339,8 @@ maintscript_fallback(struct pkginfo *pkg, char *buf; oldscriptpath = pkg_infodb_get_file(pkg, &pkg->installed, scriptname); - m_asprintf(&buf, _("old %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + buf = str_fmt(_("old %s package %s script"), + pkg_name(pkg, pnaw_nonambig), desc); command_init(&cmd, oldscriptpath, buf); command_add_args(&cmd, scriptname, ifok, @@ -366,8 +367,8 @@ maintscript_fallback(struct pkginfo *pkg, notice(_("trying script from the new package instead ...")); strcpy(cidirrest, scriptname); - m_asprintf(&buf, _("new %s package %s script"), - pkg_name(pkg, pnaw_nonambig), desc); + buf = str_fmt(_("new %s package %s script"), + pkg_name(pkg, pnaw_nonambig), desc); command_destroy(&cmd); command_init(&cmd, cidir, buf); diff --git a/src/main/verify.c b/src/main/verify.c index 68b8493b2..77aa398f9 100644 --- a/src/main/verify.c +++ b/src/main/verify.c @@ -32,6 +32,7 @@ #include <dpkg/i18n.h> #include <dpkg/dpkg.h> #include <dpkg/dpkg-db.h> +#include <dpkg/string.h> #include <dpkg/options.h> #include <dpkg/db-ctrl.h> #include <dpkg/db-fsys.h> @@ -81,7 +82,7 @@ verify_output_rpm(struct fsys_namenode *namenode, struct verify_checks *checks) if (checks->exists == VERIFY_FAIL) { memcpy(result, "missing ", sizeof(result)); if (checks->exists_errno != ENOENT) - m_asprintf(&error, " (%s)", strerror(checks->exists_errno)); + error = str_fmt(" (%s)", strerror(checks->exists_errno)); } else { result[1] = verify_result_rpm(checks->mode, 'M'); result[2] = verify_result_rpm(checks->md5sum, '5'); -- Dpkg.Org's dpkg
