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:31:39
Branch: rpm-5_4 Handle: 2014092318313801
Modified files: (Branch: rpm-5_4)
rpm/rpmdb db3.c hdrfmt.c pkgio.c rpmdb.c rpmrepo.c rpmtxn.c
Log:
- clang: fix warnings.
Summary:
Revision Changes Path
1.156.2.20 +1 -1 rpm/rpmdb/db3.c
1.151.2.25 +2 -2 rpm/rpmdb/hdrfmt.c
1.121.2.13 +1 -1 rpm/rpmdb/pkgio.c
1.392.2.24 +1 -1 rpm/rpmdb/rpmdb.c
1.4.2.4 +1 -1 rpm/rpmdb/rpmrepo.c
1.6.4.3 +1 -1 rpm/rpmdb/rpmtxn.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156.2.19 -r1.156.2.20 db3.c
--- rpm/rpmdb/db3.c 27 Aug 2014 17:40:43 -0000 1.156.2.19
+++ rpm/rpmdb/db3.c 23 Sep 2014 18:31:38 -0000 1.156.2.20
@@ -928,7 +928,7 @@
/*@*/
{
dbenv = NULL;
- dbenv = dbenv;
+ (void)dbenv;
switch (opcode) {
case DB_RECOVER:
fprintf(stderr, "\rrecovery %d%% complete", percent);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.24 -r1.151.2.25 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 22 Sep 2014 18:23:02 -0000 1.151.2.24
+++ rpm/rpmdb/hdrfmt.c 23 Sep 2014 18:31:38 -0000 1.151.2.25
@@ -3771,7 +3771,7 @@
#ifdef NOTYET /* XXX turning this on breaks rpmrepo */
const char * D = Revr->F[RPMEVR_D];
#endif
- xx = xx;
+ (void)xx;
nb += (sizeof(", 'EQ'")-1);
nb += (sizeof(", ''")-1) + strlen(E);
nb += (sizeof(", ''")-1) + strlen(V);
@@ -3824,7 +3824,7 @@
#ifdef NOTYET /* XXX turning this on breaks rpmrepo */
const char * D = Revr->F[RPMEVR_D];
#endif
- xx = xx;
+ (void)xx;
*te++ = ','; *te++ = ' ';
*te++ = q; te = stpcpy(te, Fstr[Fx]); *te++ = q;
*te++ = ','; *te++ = ' ';
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.121.2.12 -r1.121.2.13 pkgio.c
--- rpm/rpmdb/pkgio.c 18 Sep 2014 02:17:37 -0000 1.121.2.12
+++ rpm/rpmdb/pkgio.c 23 Sep 2014 18:31:39 -0000 1.121.2.13
@@ -1563,7 +1563,7 @@
if (origin != NULL) {
const char * lpath = NULL;
int ut = urlPath(origin, &lpath);
- ut = ut; /* XXX keep gcc quiet. */
+ (void)ut; /* XXX keep gcc/clang quiet. */
if (lpath && *lpath != '/') {
char * rpath = Realpath(origin, NULL);
(void) headerSetOrigin(h, (rpath ? rpath : NULL));
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.23 -r1.392.2.24 rpmdb.c
--- rpm/rpmdb/rpmdb.c 22 Sep 2014 18:23:02 -0000 1.392.2.23
+++ rpm/rpmdb/rpmdb.c 23 Sep 2014 18:31:39 -0000 1.392.2.24
@@ -958,7 +958,7 @@
/* XXX av contains a colon separated path split, use the 1st path. */
urltype ut = urlPath(av[0], &fn);
-xx = xx;
+(void)xx;
switch (ut) {
case URL_IS_PATH:
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmrepo.c
============================================================================
$ cvs diff -u -r1.4.2.3 -r1.4.2.4 rpmrepo.c
--- rpm/rpmdb/rpmrepo.c 29 Aug 2014 14:29:15 -0000 1.4.2.3
+++ rpm/rpmdb/rpmrepo.c 23 Sep 2014 18:31:39 -0000 1.4.2.4
@@ -1497,7 +1497,7 @@
char * t = xmalloc(tlen + 1);
char * te = t;
- xx = xx;
+ (void)xx;
/*@-nullptrarith@*/
for (f = s; *f != '\0' && (fe = strstr(f, mark)) != NULL; fe += nmark,
f = fe) {
*fe = '\0';
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtxn.c
============================================================================
$ cvs diff -u -r1.6.4.2 -r1.6.4.3 rpmtxn.c
--- rpm/rpmdb/rpmtxn.c 15 Apr 2012 21:20:55 -0000 1.6.4.2
+++ rpm/rpmdb/rpmtxn.c 23 Sep 2014 18:31:39 -0000 1.6.4.3
@@ -31,7 +31,7 @@
DB_TXN * _txn = (DB_TXN *) txn;
const char * N = NULL;
int rc = (_txn ? _txn->get_name(_txn, &N) : ENOTSUP);
- rc = rc;
+ (void)rc;
return N;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
