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: 23-Sep-2014 20:30:31
Branch: rpm-5_4 Handle: 2014092318303100
Modified files: (Branch: rpm-5_4)
rpm/tools spooktool.c sqlite3.c
Log:
- clang: fix warnings.
Summary:
Revision Changes Path
2.4.4.1 +1 -2 rpm/tools/spooktool.c
2.4.2.3 +1 -1 rpm/tools/sqlite3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/spooktool.c
============================================================================
$ cvs diff -u -r2.4 -r2.4.4.1 spooktool.c
--- rpm/tools/spooktool.c 21 Mar 2010 23:21:34 -0000 2.4
+++ rpm/tools/spooktool.c 23 Sep 2014 18:30:31 -0000 2.4.4.1
@@ -97,7 +97,6 @@
{
rpmioP P = NULL;
rpmRC rc = RPMRC_OK; /* assume success */
- int xx;
if (sm == NULL) sm = _rpmsmI;
@@ -144,7 +143,7 @@
} else
if ((rc = (*handler)(P->ac, (char **)P->av)) == RPMRC_FAIL) {
static char ibuf[32];
- (void) snprintf(ibuf, sizeof(ibuf), "%d", xx);
+ (void) snprintf(ibuf, sizeof(ibuf), "%d", rc);
rpmiobAppend(sm->iob, "Failed(", 0);
rpmiobAppend(sm->iob, ibuf, 0);
rpmiobAppend(sm->iob, "): ", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/sqlite3.c
============================================================================
$ cvs diff -u -r2.4.2.2 -r2.4.2.3 sqlite3.c
--- rpm/tools/sqlite3.c 17 Aug 2014 13:13:44 -0000 2.4.2.2
+++ rpm/tools/sqlite3.c 23 Sep 2014 18:30:31 -0000 2.4.2.3
@@ -44,7 +44,7 @@
*/
static void interrupt_handler(int NotUsed)
{
- NotUsed = NotUsed;
+ (void)NotUsed;
_rpmsqlSeenInterrupt = 1;
#if defined(WITH_SQLITE)
if (_rpmsqlI && _rpmsqlI->I) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
