This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=d36b97a58ca207eae556f69637b4edaa2d1a169a commit d36b97a58ca207eae556f69637b4edaa2d1a169a Author: Guillem Jover <[email protected]> AuthorDate: Wed Aug 15 22:13:38 2018 +0200 libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const() This will make it possible to switch the pkg_name() and pkgbin_name() back to take non-const structs, and then fill the pkgname_archqual cache on demand. --- debian/changelog | 1 + dselect/pkgtop.cc | 2 +- lib/dpkg/dump.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f5c17720..118a3d2e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -175,6 +175,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - libdpkg: Factor out cached arch-qualified package name generation into new pkgbin_name_archqual() function. - libdpkg: Add new pkg_name() and pkgbin_name() const variants. + - libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const(). * Build system: - Set distribution tarball format to ustar, instead of default v7 format. - Mark PO4A and POD2MAN as precious variables. diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc index 6e233a1f9..b8a644ca5 100644 --- a/dselect/pkgtop.cc +++ b/dselect/pkgtop.cc @@ -43,7 +43,7 @@ pkgprioritystring(const struct pkginfo *pkg) } else { if (pkg->priority > PKG_PRIO_UNKNOWN) internerr("package %s has out-of-range priority %d", - pkg_name(pkg, pnaw_always), pkg->priority); + pkg_name_const(pkg, pnaw_always), pkg->priority); return gettext(prioritystrings[pkg->priority]); } } diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index 8086cf77f..a5f040184 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -234,7 +234,7 @@ w_priority(struct varbuf *vb, if (pkg->priority > PKG_PRIO_UNKNOWN) internerr("package %s has out-of-range priority %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->priority); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->priority); if (flags&fw_printheader) varbuf_add_str(vb, "Priority: "); @@ -253,39 +253,39 @@ w_status(struct varbuf *vb, if (pkg->want > PKG_WANT_PURGE) internerr("package %s has unknown want state %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->want); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->want); if (pkg->eflag > PKG_EFLAG_REINSTREQ) internerr("package %s has unknown error state %d", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg->eflag); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->eflag); switch (pkg->status) { case PKG_STAT_NOTINSTALLED: case PKG_STAT_CONFIGFILES: if (pkg->trigpend_head || pkg->trigaw.head) internerr("package %s in state %s, has awaited or pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_HALFINSTALLED: case PKG_STAT_UNPACKED: case PKG_STAT_HALFCONFIGURED: if (pkg->trigpend_head) internerr("package %s in state %s, has pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSAWAITED: if (pkg->trigaw.head == NULL) internerr("package %s in state %s, has no awaited triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_TRIGGERSPENDING: if (pkg->trigpend_head == NULL || pkg->trigaw.head) internerr("package %s in stata %s, has awaited or no pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; case PKG_STAT_INSTALLED: if (pkg->trigpend_head || pkg->trigaw.head) internerr("package %s in state %s, has awaited or pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); break; default: internerr("unknown package status '%d'", pkg->status); @@ -357,7 +357,7 @@ w_dependency(struct varbuf *vb, if (dyp->up != pkg) internerr("dependency and package %s not linked properly", - pkgbin_name(pkg, pkgbin, pnaw_always)); + pkgbin_name_const(pkg, pkgbin, pnaw_always)); if (dep_found) { varbuf_add_str(vb, ", "); @@ -410,7 +410,7 @@ w_trigpend(struct varbuf *vb, if (pkg->status < PKG_STAT_TRIGGERSAWAITED || pkg->status > PKG_STAT_TRIGGERSPENDING) internerr("package %s in non-trigger state %s, has pending triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Pending:"); @@ -435,7 +435,7 @@ w_trigaw(struct varbuf *vb, if (pkg->status <= PKG_STAT_CONFIGFILES || pkg->status > PKG_STAT_TRIGGERSAWAITED) internerr("package %s in state %s, has awaited triggers", - pkgbin_name(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); + pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg)); if (flags & fw_printheader) varbuf_add_str(vb, "Triggers-Awaited:"); @@ -486,7 +486,7 @@ writerecord(FILE *file, const char *filename, if (fputs(vb.buf, file) < 0) ohshite(_("failed to write details of '%.50s' to '%.250s'"), - pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename); + pkgbin_name_const(pkg, pkgbin, pnaw_nonambig), filename); varbuf_destroy(&vb); } -- Dpkg.Org's dpkg
