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: 24-Sep-2014 15:05:09
Branch: rpm-5_4 Handle: 2014092413050800
Modified files: (Branch: rpm-5_4)
rpm/rpmdb dbconfig.c hdrfmt.c header.c rpmdb.c rpmtd.c
sqlite.c tagname.c
Log:
- clang has a superset of GCC #pragma.
Summary:
Revision Changes Path
1.78.4.14 +3 -7 rpm/rpmdb/dbconfig.c
1.151.2.26 +3 -7 rpm/rpmdb/hdrfmt.c
1.198.2.14 +3 -7 rpm/rpmdb/header.c
1.392.2.25 +15 -35 rpm/rpmdb/rpmdb.c
1.11.6.6 +9 -21 rpm/rpmdb/rpmtd.c
1.44.4.17 +9 -21 rpm/rpmdb/sqlite.c
1.34.2.10 +6 -14 rpm/rpmdb/tagname.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.78.4.13 -r1.78.4.14 dbconfig.c
--- rpm/rpmdb/dbconfig.c 22 Sep 2014 18:23:02 -0000 1.78.4.13
+++ rpm/rpmdb/dbconfig.c 24 Sep 2014 13:05:08 -0000 1.78.4.14
@@ -490,10 +490,8 @@
static const char * const _dbDefault = " auto_commit create";
const char * _dbType;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
_dbType = "btree"; /* XXX rpm.org uses hash */
@@ -512,9 +510,7 @@
_dbType = "btree bt_dupsort primary=Packages";
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
dbOpts = _free(dbOpts);
dbOpts = rpmExpand(_dbType, _dbDefault, NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.25 -r1.151.2.26 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 23 Sep 2014 18:31:38 -0000 1.151.2.25
+++ rpm/rpmdb/hdrfmt.c 24 Sep 2014 13:05:08 -0000 1.151.2.26
@@ -1586,10 +1586,8 @@
} else {
const char * s;
rpmfileState fstate = he->p.ui8p[ix];
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (fstate) {
case RPMFILE_STATE_NORMAL:
s = _("normal");
@@ -1616,9 +1614,7 @@
s = _("(unknown)");
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
val = xstrdup(s);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.198.2.13 -r1.198.2.14 header.c
--- rpm/rpmdb/header.c 22 Sep 2014 18:23:02 -0000 1.198.2.13
+++ rpm/rpmdb/header.c 24 Sep 2014 13:05:08 -0000 1.198.2.14
@@ -442,10 +442,8 @@
size_t nb = 0;
int rc = 1; /* assume success */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (he->t) {
default:
assert(0); /* XXX stop unimplemented oversights. */
@@ -482,9 +480,7 @@
case RPM_STRING_ARRAY_TYPE:
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
/* Allocate all returned storage (if not already). */
if (he->p.ptr && nb && !he->freeData) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.24 -r1.392.2.25 rpmdb.c
--- rpm/rpmdb/rpmdb.c 23 Sep 2014 18:31:39 -0000 1.392.2.24
+++ rpm/rpmdb/rpmdb.c 24 Sep 2014 13:05:08 -0000 1.392.2.25
@@ -793,10 +793,8 @@
if (db == NULL) return -2;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
if (db->db_tags != NULL && db->_dbi != NULL) {
size_t dbix;
for (dbix = 0; dbix < db->db_ndbi; dbix++) {
@@ -822,9 +820,7 @@
(void) dbiOpen(db, db->db_tags[dbix].tag, db->db_flags);
}
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return rc;
}
@@ -1124,10 +1120,8 @@
db->db_api = _dbapi;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
{ size_t dbix;
rc = 0;
@@ -1172,9 +1166,7 @@
}
}
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
exit:
if (rc || dbp == NULL)
@@ -2520,10 +2512,8 @@
(void) rpmdbCheckSignals();
/* XXX Control for whether patterns are permitted. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
default: break;
case 2: /* XXX HACK to remove RPMDBI_LABEL from RPM. */
@@ -2557,9 +2547,7 @@
usePatterns = 1;
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
dbi = dbiOpen(db, tag, 0);
#ifdef NOTYET /* XXX non-configured tag indices force NULL return */
@@ -2846,10 +2834,8 @@
(void) memset(he, 0, sizeof(*he));
he->tag = dbiTag->tag;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (he->tag) {
default:
/* Don't bother if tag is not present. */
@@ -2896,9 +2882,7 @@
/*@switchbreak@*/ break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
} while (dbix-- > 0);
@@ -2990,10 +2974,8 @@
(void) memset(he, 0, sizeof(*he));
he->tag = dbiTag->tag;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (he->tag) {
default:
/* Don't bother if tag is not present. */
@@ -3046,9 +3028,7 @@
v.size = 0;
/*@switchbreak@*/ break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
} while (dbix-- > 0);
rc = RPMRC_OK; /* XXX RPMRC */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtd.c
============================================================================
$ cvs diff -u -r1.11.6.5 -r1.11.6.6 rpmtd.c
--- rpm/rpmdb/rpmtd.c 22 Sep 2014 18:23:03 -0000 1.11.6.5
+++ rpm/rpmdb/rpmtd.c 24 Sep 2014 13:05:08 -0000 1.11.6.6
@@ -26,10 +26,8 @@
{
rpmTagClass class;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (type & RPM_MASK_TYPE) {
case RPM_CHAR_TYPE:
case RPM_INT8_TYPE:
@@ -54,9 +52,7 @@
class = RPM_NULL_CLASS;
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return class;
}
@@ -339,10 +335,8 @@
int ix = (td->ix >= 0 ? td->ix : 0);
assert(td != NULL);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (td->type) {
case RPM_INT64_TYPE:
val = *((uint64_t *) td->data + ix);
@@ -360,9 +354,7 @@
default:
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return val;
}
@@ -445,10 +437,8 @@
* treated specially otherwise.
*/
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (type) {
case RPM_CHAR_TYPE:
case RPM_INT8_TYPE:
@@ -460,9 +450,7 @@
default:
return 0;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return rpmtdSet(td, tag, type, data, count);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.44.4.16 -r1.44.4.17 sqlite.c
--- rpm/rpmdb/sqlite.c 22 Sep 2014 18:23:03 -0000 1.44.4.16
+++ rpm/rpmdb/sqlite.c 24 Sep 2014 13:05:08 -0000 1.44.4.17
@@ -666,10 +666,8 @@
assert(key->data != NULL);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (dbi->dbi_rpmtag) {
case RPMDBI_PACKAGES:
{ unsigned int hnum;
@@ -728,9 +726,7 @@
/*@innerbreak@*/ break;
}
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return rc;
}
@@ -1026,10 +1022,8 @@
const char * keytype;
int kt;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (dbi->dbi_rpmtag) {
case RPMDBI_PACKAGES:
rc = sql_exec(dbi, _Packages_sql_init, NULL, NULL);
@@ -1043,9 +1037,7 @@
keytype = tagTypes[(kt > 0 && kt < (int)ntagTypes ? kt : 0)];
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
if (keytype) {
/* XXX no need for IF NOT EXISTS */
@@ -1441,10 +1433,8 @@
assert(scp->cmd == NULL); /* XXX memleak prevention */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (dbi->dbi_rpmtag) {
case RPMDBI_PACKAGES:
scp->cmd = sqlite3_mprintf("SELECT key FROM '%q' ORDER BY key;",
@@ -1455,9 +1445,7 @@
dbi->dbi_subfile);
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
rc = cvtdberr(dbi, "sqlite3_prepare",
sqlite3_prepare(sqlI, scp->cmd,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/tagname.c
============================================================================
$ cvs diff -u -r1.34.2.9 -r1.34.2.10 tagname.c
--- rpm/rpmdb/tagname.c 22 Sep 2014 18:23:03 -0000 1.34.2.9
+++ rpm/rpmdb/tagname.c 24 Sep 2014 13:05:08 -0000 1.34.2.10
@@ -209,10 +209,8 @@
nameBuf[0] = nameBuf[1] = '\0';
nameBufLen = _rpmTags.nameBufLen;
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
strncpy(nameBuf, "Packages", nameBufLen);
@@ -299,9 +297,7 @@
}
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
if (nameBuf[0] == '\0')
xx = snprintf(nameBuf, nameBufLen, "Tag_0x%08x", (unsigned) tag);
nameBuf[nameBufLen-1] = '\0';
@@ -323,10 +319,8 @@
if (_rpmTags.byValue == NULL)
xx = tagLoadIndex(&_rpmTags.byValue, &_rpmTags.byValueSize,
tagCmpValue);
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
case RPMDBI_DEPCACHE:
@@ -369,9 +363,7 @@
}
break;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#pragma GCC diagnostic pop
return 0;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
