RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 05-Jul-2016 16:46:58 Branch: rpm-5_4 Handle: 2016070514465700 Modified files: (Branch: rpm-5_4) rpm/rpmio iosm.c rpmgc.c rpmlog.h Log: - rpmlog: fix: add RPM_GNU_PRINTF attribute, fix detected issues. Summary: Revision Changes Path 1.43.2.9 +1 -1 rpm/rpmio/iosm.c 2.34.2.12 +3 -2 rpm/rpmio/rpmgc.c 2.24.4.6 +3 -2 rpm/rpmio/rpmlog.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/iosm.c ============================================================================ $ cvs diff -u -r1.43.2.8 -r1.43.2.9 iosm.c --- rpm/rpmio/iosm.c 29 Mar 2016 16:40:31 -0000 1.43.2.8 +++ rpm/rpmio/iosm.c 5 Jul 2016 14:46:57 -0000 1.43.2.9 @@ -519,7 +519,7 @@ if (iosm->goal == IOSM_PKGBUILD) --iosm->li->linksLeft; if (iosm->li->linksLeft > (int) st->st_nlink) { - rpmlog(RPMLOG_ERR, _("Corrupted hardlinks found (count %d does not match %d), exiting.\n"), iosm->li->linksLeft, st->st_nlink); + rpmlog(RPMLOG_ERR, _("Corrupted hardlinks found (count %d does not match %d), exiting.\n"), iosm->li->linksLeft, (int)st->st_nlink); return -1; } @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmgc.c ============================================================================ $ cvs diff -u -r2.34.2.11 -r2.34.2.12 rpmgc.c --- rpm/rpmio/rpmgc.c 17 Sep 2014 03:36:21 -0000 2.34.2.11 +++ rpm/rpmio/rpmgc.c 5 Jul 2016 14:46:57 -0000 2.34.2.12 @@ -1108,10 +1108,11 @@ static void rpmgcFatal(void * opaque, int lvl, const char * msg) { - rpmlog(lvl2log(lvl), msg); + rpmlog(lvl2log(lvl), "%s", msg); } -static void rpmgcLog(void * opaque, int lvl, const char * fmt, va_list ap) +static void RPM_GNUC_PRINTF(3, 0) +rpmgcLog(void * opaque, int lvl, const char * fmt, va_list ap) { (void)opaque; vrpmlog(lvl2log(lvl), fmt, ap); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlog.h ============================================================================ $ cvs diff -u -r2.24.4.5 -r2.24.4.6 rpmlog.h --- rpm/rpmio/rpmlog.h 25 Jun 2016 07:31:08 -0000 2.24.4.5 +++ rpm/rpmio/rpmlog.h 5 Jul 2016 14:46:57 -0000 2.24.4.6 @@ -269,9 +269,10 @@ /** * Same as _rpmlog with stdarg argument list. */ -void vrpmlog (unsigned code, const char * fmt, va_list ap); +void vrpmlog (unsigned code, const char * fmt, va_list ap) + RPM_GNUC_PRINTF(2, 0); -static inline +static inline RPM_GNUC_PRINTF(2, 3) void rpmlog (int code, const char *fmt, ...) { unsigned pri = RPMLOG_PRI(code); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org