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=a7b4a9ae06acdffb46313b76e91c0a40b7b1b63c commit a7b4a9ae06acdffb46313b76e91c0a40b7b1b63c Author: Guillem Jover <guil...@debian.org> AuthorDate: Thu Feb 23 03:47:43 2017 +0100 dselect: Use static_cast<> instead of old-style type qualifier cast Warned-by: g++ -Wcast-qual --- debian/changelog | 1 + dselect/baselist.cc | 4 ++-- dselect/main.cc | 4 ++-- dselect/pkglist.cc | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d396d9a4a..f3e83543d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -189,6 +189,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - dselect: Reorder branches in packagelist::deselect_one_of so that they are not duplicated. - dselect: Use nullptr instead of NULL. + - dselect: Use static_cast<> instead of old-style type qualifier cast. * Build system: - Bump minimal Perl version to 5.24.1. - Add a serial versioning to the m4 files. diff --git a/dselect/baselist.cc b/dselect/baselist.cc index 4fa7f22b5..d81cca812 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -64,8 +64,8 @@ void baselist::sigwinchhandler(int) { } static void cu_sigwinch(int, void **argv) { - struct sigaction *osigactp= (struct sigaction*)argv[0]; - sigset_t *oblockedp= (sigset_t*)argv[1]; + struct sigaction *osigactp = static_cast<struct sigaction *>(argv[0]); + sigset_t *oblockedp = static_cast<sigset_t *>(argv[1]); if (sigaction(SIGWINCH, osigactp, nullptr)) ohshite(_("failed to restore old SIGWINCH sigact")); diff --git a/dselect/main.cc b/dselect/main.cc index 32b53cbb0..9b255d84d 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -354,8 +354,8 @@ void cursesoff() { } urqresult urq_list(void) { - modstatdb_open((modstatdb_rw)(msdbrw_writeifposs | - msdbrw_available_readonly)); + modstatdb_open(static_cast<modstatdb_rw>(msdbrw_writeifposs | + msdbrw_available_readonly)); curseson(); diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index 2efb80f92..9ffe85517 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -151,8 +151,10 @@ void packagelist::addheading(enum ssavailval ssavail, static packagelist *sortpackagelist; int qsort_compareentries(const void *a, const void *b) { - return sortpackagelist->compareentries(*(const struct perpackagestate **)a, - *(const struct perpackagestate **)b); + const struct perpackagestate *pa = *static_cast<const struct perpackagestate * const *>(a); + const struct perpackagestate *pb = *static_cast<const struct perpackagestate * const *>(b); + + return sortpackagelist->compareentries(pa, pb); } void packagelist::sortinplace() { -- Dpkg.Org's dpkg
