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: 22-Sep-2014 20:16:31
Branch: rpm-5_4 Handle: 2014092218163000
Modified files: (Branch: rpm-5_4)
rpm/lib psm.c query.c rpmds.c rpmgi.c rpmts.c
Log:
- gcc: remove clang pragma fluff.
Summary:
Revision Changes Path
2.399.2.16 +12 -0 rpm/lib/psm.c
2.216.2.12 +4 -0 rpm/lib/query.c
2.170.2.27 +8 -0 rpm/lib/rpmds.c
2.75.2.10 +4 -0 rpm/lib/rpmgi.c
2.188.2.12 +5 -1 rpm/lib/rpmts.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.399.2.15 -r2.399.2.16 psm.c
--- rpm/lib/psm.c 18 Sep 2014 02:18:55 -0000 2.399.2.15
+++ rpm/lib/psm.c 22 Sep 2014 18:16:30 -0000 2.399.2.16
@@ -465,15 +465,19 @@
(unsigned)psm->sq.reaped, psm->sq.status,
(unsigned)msecs/1000, (unsigned)msecs%1000);
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
+#endif
if (psm->sstates != NULL)
{ rpmuint32_t * ssp = psm->sstates + tag2slx(psm->scriptTag);
*ssp &= ~0xffff;
*ssp |= (psm->sq.status & 0xffff);
*ssp |= RPMSCRIPT_STATE_REAPED;
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
return psm->sq.reaped;
}
@@ -629,11 +633,15 @@
rpmuint32_t * ssp = NULL;
int inChroot = enterChroot(psm, &pwdFdno, &rootFdno);
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
+#endif
if (psm->sstates != NULL)
ssp = psm->sstates + tag2slx(psm->scriptTag);
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
if (ssp != NULL)
*ssp |= (RPMSCRIPT_STATE_EMBEDDED|RPMSCRIPT_STATE_EXEC);
@@ -836,11 +844,15 @@
int xx;
int i;
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
+#endif
if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX)
ssp = psm->sstates + ix;
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
if (ssp != NULL)
*ssp = RPMSCRIPT_STATE_UNKNOWN;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.216.2.11 -r2.216.2.12 query.c
--- rpm/lib/query.c 10 Sep 2014 20:10:05 -0000 2.216.2.11
+++ rpm/lib/query.c 22 Sep 2014 18:16:30 -0000 2.216.2.12
@@ -340,8 +340,10 @@
te = stpcpy(te, prefix);
/* XXX FIXME: call code in rpmdb/hdrfmt.c instead */
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#endif
if (QVA_ISSET(qva->qva_flags, FOR_STATE)) {
switch (fstate) {
case RPMFILE_STATE_NORMAL:
@@ -368,7 +370,9 @@
/*@switchbreak@*/ break;
}
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
if (QVA_ISSET(qva->qva_flags, FOR_DUMPFILES)) {
sprintf(te, "%s %d %d %s 0%o ",
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.170.2.26 -r2.170.2.27 rpmds.c
--- rpm/lib/rpmds.c 10 Sep 2014 20:10:05 -0000 2.170.2.26
+++ rpm/lib/rpmds.c 22 Sep 2014 18:16:30 -0000 2.170.2.27
@@ -154,10 +154,14 @@
case RPMTAG_DIRNAMES: Type = "Dirs"; break;
case RPMTAG_BASENAMES: Type = "Files"; break;
case RPMTAG_FILELINKTOS: Type = "Linktos"; break;
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#endif
case 0: Type = "Unknown"; break;
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
}
return Type;
}
@@ -3820,8 +3824,10 @@
un = &myun;
}
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
+#endif
/*@-type@*/
/* XXX values need to be checked for EVR (i.e. no '-' character.) */
if (un->sysname != NULL)
@@ -3841,7 +3847,9 @@
rpmdsNSAdd(dsp, NS, "domainname", un->domainname, RPMSENSE_EQUAL);
#endif
/*@=type@*/
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
rc = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.75.2.9 -r2.75.2.10 rpmgi.c
--- rpm/lib/rpmgi.c 10 Sep 2014 20:10:05 -0000 2.75.2.9
+++ rpm/lib/rpmgi.c 22 Sep 2014 18:16:30 -0000 2.75.2.10
@@ -599,8 +599,10 @@
gi->hdrPath = _free(gi->hdrPath);
hnum[0] = '\0';
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#endif
if (++gi->i >= 0)
switch (gi->tag) {
default:
@@ -773,7 +775,9 @@
gi->hdrPath = xstrdup(gi->fts->fts_path);
break;
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
if ((gi->flags & RPMGI_TSADD) && gi->h != NULL) {
/* XXX rpmgi hack: Save header in transaction element. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.188.2.11 -r2.188.2.12 rpmts.c
--- rpm/lib/rpmts.c 10 Sep 2014 20:08:12 -0000 2.188.2.11
+++ rpm/lib/rpmts.c 22 Sep 2014 18:16:30 -0000 2.188.2.12
@@ -171,8 +171,10 @@
/* Remove configured secondary indices. */
switch (dbiTags->tag) {
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#endif
case RPMDBI_PACKAGES:
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
@@ -184,7 +186,9 @@
case RPMDBI_QUEUE:
case RPMDBI_RECNO:
continue;
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
/*@notreached@*/ /*@switchbreak@*/ break;
default:
fn = rpmGetPath(db->db_root, db->db_home, "/",
@@ -1205,7 +1209,7 @@
{
iosmFileAction action = (iosmFileAction) _action;
rpmDiskSpaceInfo dsi;
- rpmuint64_t bneeded;
+ signed long long bneeded;
dsi = ts->dsi;
if (dsi) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
