[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm-5_4: rpm/rpmdb/ db3.c dbconfig.c fprint.c fprint.h hdrf...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2014-09-27 15:52:37
Message-ID: 20140927155237.CF4627CCB9 () rpm5 ! org
[Download RAW message or body]
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 27-Sep-2014 17:52:37
Branch: rpm-5_4 Handle: 2014092715523303
Modified files: (Branch: rpm-5_4)
rpm/rpmdb db3.c dbconfig.c fprint.c fprint.h hdrfmt.c
header.c pkgio.c pkgio.h rpmdb.c rpmdpkg.h
rpmevr.h rpmtag.h rpmtd.c rpmtd.h sqlite.c
tagname.c
Log:
- rpmdb: -Wdocumentation fixes.
Summary:
Revision Changes Path
1.156.2.22 +1 -1 rpm/rpmdb/db3.c
1.78.4.15 +3 -3 rpm/rpmdb/dbconfig.c
1.40.4.4 +1 -1 rpm/rpmdb/fprint.c
1.20.4.4 +3 -3 rpm/rpmdb/fprint.h
1.151.2.28 +12 -12 rpm/rpmdb/hdrfmt.c
1.198.2.16 +5 -5 rpm/rpmdb/header.c
1.121.2.15 +13 -13 rpm/rpmdb/pkgio.c
1.19.4.2 +5 -5 rpm/rpmdb/pkgio.h
1.392.2.27 +15 -15 rpm/rpmdb/rpmdb.c
1.2.8.3 +1 -1 rpm/rpmdb/rpmdpkg.h
1.11.4.4 +4 -11 rpm/rpmdb/rpmevr.h
1.70.4.15 +3 -2 rpm/rpmdb/rpmtag.h
1.11.6.8 +9 -9 rpm/rpmdb/rpmtd.c
1.8.6.3 +2 -1 rpm/rpmdb/rpmtd.h
1.44.4.18 +9 -9 rpm/rpmdb/sqlite.c
1.34.2.11 +13 -13 rpm/rpmdb/tagname.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156.2.21 -r1.156.2.22 db3.c
--- rpm/rpmdb/db3.c 24 Sep 2014 13:27:53 -0000 1.156.2.21
+++ rpm/rpmdb/db3.c 27 Sep 2014 15:52:33 -0000 1.156.2.22
@@ -655,7 +655,7 @@
* @param pid process id
* @param tid thread id
* @param flags 0 or DB_MUTEX_PROCESS_ONLY
- * @return
+ * @return 1 if process is running, 0 otherwise
*/
static int db3is_alive(/*@unused@*/ DB_ENV *dbenv, pid_t pid,
/*@unused@*/ db_threadid_t tid,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.78.4.14 -r1.78.4.15 dbconfig.c
--- rpm/rpmdb/dbconfig.c 24 Sep 2014 13:05:08 -0000 1.78.4.14
+++ rpm/rpmdb/dbconfig.c 27 Sep 2014 15:52:33 -0000 1.78.4.15
@@ -479,6 +479,8 @@
return (dbiIndex) rpmioGetPool(pool, sizeof(*dbi));
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
dbiIndex db3New(rpmdb rpmdb, rpmTag tag)
{
dbiIndex dbi = dbiGetPool(_dbiPool);
@@ -490,8 +492,6 @@
static const char * const _dbDefault = " auto_commit create";
const char * _dbType;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
_dbType = "btree"; /* XXX rpm.org uses hash */
@@ -510,7 +510,6 @@
_dbType = "btree bt_dupsort primary=Packages";
break;
}
-#pragma GCC diagnostic pop
dbOpts = _free(dbOpts);
dbOpts = rpmExpand(_dbType, _dbDefault, NULL);
@@ -663,6 +662,7 @@
return (dbiIndex)rpmioLinkPoolItem((rpmioItem)dbi, __FUNCTION__, __FILE__, \
__LINE__); /*@=globstate@*/
}
+#pragma GCC diagnostic pop
const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
============================================================================
$ cvs diff -u -r1.40.4.3 -r1.40.4.4 fprint.c
--- rpm/rpmdb/fprint.c 16 Apr 2012 23:43:34 -0000 1.40.4.3
+++ rpm/rpmdb/fprint.c 27 Sep 2014 15:52:33 -0000 1.40.4.4
@@ -58,7 +58,7 @@
* @param cache pointer to fingerprint cache
* @param dirName leading directory name of path
* @param baseName file name of path
- * @param scareMem
+ * @param scareMem scareMem
* @return pointer to the finger print associated with a file path.
*/
static fingerPrint doLookup(fingerPrintCache cache,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.h
============================================================================
$ cvs diff -u -r1.20.4.3 -r1.20.4.4 fprint.h
--- rpm/rpmdb/fprint.h 24 Sep 2014 13:27:54 -0000 1.20.4.3
+++ rpm/rpmdb/fprint.h 27 Sep 2014 15:52:33 -0000 1.20.4.4
@@ -99,7 +99,7 @@
* @param cache pointer to fingerprint cache
* @param dirName leading directory name of file path
* @param baseName base name of file path
- * @param scareMem
+ * @param scareMem scareMem
* @return pointer to the finger print associated with a file path.
*/
fingerPrint fpLookup(fingerPrintCache cache, const char * dirName,
@@ -111,7 +111,7 @@
* Return hash value for a finger print.
* Hash based on dev and inode only!
* @param h hash initial value
- * @param *data finger print entry
+ * @param data *data finger print entry
* @param size size of fingerprint entry
* @return hash value
*/
@@ -138,7 +138,7 @@
* @param baseNames file base names
* @param dirIndexes index into dirNames for each baseNames
* @param fileCount number of file entries
- * @retval *fpList array of finger prints
+ * @retval fplist *fpList array of finger prints
*/
void fpLookupList(fingerPrintCache cache, const char ** dirNames,
const char ** baseNames, const rpmuint32_t * dirIndexes,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.27 -r1.151.2.28 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 24 Sep 2014 13:27:54 -0000 1.151.2.27
+++ rpm/rpmdb/hdrfmt.c 27 Sep 2014 15:52:33 -0000 1.151.2.28
@@ -1580,6 +1580,8 @@
* @param av parameter list (or NULL)
* @return formatted string
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static char * fstateFormat(HE_t he, const char ** av)
{
int ix = (he->ix > 0 ? he->ix : 0);
@@ -1590,8 +1592,6 @@
} else {
const char * s;
rpmfileState fstate = he->p.ui8p[ix];
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (fstate) {
case RPMFILE_STATE_NORMAL:
s = _("normal");
@@ -1618,13 +1618,13 @@
s = _("(unknown)");
break;
}
-#pragma GCC diagnostic pop
val = xstrdup(s);
}
return val;
}
+#pragma GCC diagnostic pop
/**
* Return verify flags.
@@ -5959,9 +5959,9 @@
/**
* Parse a headerSprintf expression.
* @param hsa headerSprintf args
- * @param token
- * @param str
- * @retval *endPtr
+ * @param token token
+ * @param str str
+ * @retval endPtr *endPtr
* @return 0 on success
*/
static int parseExpression(headerSprintfArgs hsa, sprintfToken token,
@@ -5972,11 +5972,11 @@
/**
* Parse a headerSprintf term.
* @param hsa headerSprintf args
- * @param str
- * @retval *formatPtr
- * @retval *numTokensPtr
- * @retval *endPtr
- * @param state
+ * @param str str
+ * @retval formatPtr *formatPtr
+ * @retval numTokensPtr *numTokensPtr
+ * @retval endPtr *endPtr
+ * @param state state
* @return 0 on success
*/
static int parseFormat(headerSprintfArgs hsa, char * str,
@@ -6853,7 +6853,7 @@
/**
* Create an extension cache.
* @param exts headerSprintf extensions
- * @retval *necp no. of elements (or NULL)
+ * @retval necp *necp no. of elements (or NULL)
* @return new extension cache
*/
static /*@only@*/ HE_t
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.198.2.15 -r1.198.2.16 header.c
--- rpm/rpmdb/header.c 24 Sep 2014 13:27:54 -0000 1.198.2.15
+++ rpm/rpmdb/header.c 27 Sep 2014 15:52:33 -0000 1.198.2.16
@@ -321,10 +321,10 @@
/**
* Return length of entry data.
* @param type entry data type
- * @param *p tag container data
+ * @param p *p tag container data
* @param count entry item count
* @param onDisk data is concatenated strings (with NUL's))?
- * @param *pend pointer to end of tag container data (or NULL)
+ * @param pend *pend pointer to end of tag container data (or NULL)
* @return no. bytes in data, 0 on failure
*/
RPM_GNUC_PURE
@@ -432,6 +432,8 @@
/*@=compdef@*/
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
/**
* Always realloc HE_t memory.
* @param he tag container
@@ -443,8 +445,6 @@
size_t nb = 0;
int rc = 1; /* assume success */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (he->t) {
default:
assert(0); /* XXX stop unimplemented oversights. */
@@ -481,7 +481,6 @@
case RPM_STRING_ARRAY_TYPE:
break;
}
-#pragma GCC diagnostic pop
/* Allocate all returned storage (if not already). */
if (he->p.ptr && nb && !he->freeData) {
@@ -501,6 +500,7 @@
return rc;
}
+#pragma GCC diagnostic pop
/** \ingroup header
* Swab rpmuint64_t/rpmuint32_t/rpmuint16_t arrays within header region.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.121.2.14 -r1.121.2.15 pkgio.c
--- rpm/rpmdb/pkgio.c 24 Sep 2014 13:27:54 -0000 1.121.2.14
+++ rpm/rpmdb/pkgio.c 27 Sep 2014 15:52:34 -0000 1.121.2.15
@@ -68,7 +68,7 @@
* Write (with unload) header to file handle.
* @param fd file handle
* @param h header
- * @retval *msg failure msg
+ * @retval msg *msg failure msg
* @return RPMRC_OK on success
*/
static
@@ -502,7 +502,7 @@
* Write lead to file handle.
* @param fd file handle
* @param ptr package lead
- * @param *msg name to include in lead (or NULL)
+ * @param msg *msg name to include in lead (or NULL)
* @return RPMRC_OK on success, RPMRC_FAIL on error
*/
static rpmRC wrLead(FD_t fd, const void * ptr, /*@null@*/ const char ** msg)
@@ -540,8 +540,8 @@
/**
* Read lead from file handle.
* @param fd file handle
- * @retval *ptr package lead
- * @retval *msg failure msg
+ * @retval ptr *ptr package lead
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC rdLead(FD_t fd, /*@out@*/ /*@null@*/ void * ptr,
@@ -668,7 +668,7 @@
* Write signature header.
* @param fd file handle
* @param ptr signature header
- * @retval *msg failure msg
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC wrSignature(FD_t fd, void * ptr,
@@ -744,8 +744,8 @@
/**
* Read (and verify header+payload size) signature header.
* @param fd file handle
- * @retval *ptr signature header (or NULL)
- * @retval *msg failure msg
+ * @retval ptr *ptr signature header (or NULL)
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC rdSignature(FD_t fd, /*@out@*/ /*@null@*/ void * ptr,
@@ -1070,7 +1070,7 @@
* @param dig signature parameters container
* @param uh unloaded header blob
* @param uc no. of bytes in blob (or 0 to disable)
- * @retval *msg signature verification msg
+ * @retval msg *msg signature verification msg
* @return RPMRC_OK/RPMRC_NOTFOUND/RPMRC_FAIL
*/
rpmRC headerCheck(pgpDig dig, const void * uh, size_t uc, const char ** msg)
@@ -1394,7 +1394,7 @@
* Check metadata header.
* @param fd file handle
* @param ptr metadata header
- * @retval *msg failure msg
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC ckHeader(/*@unused@*/ FD_t fd, const void * ptr,
@@ -1418,7 +1418,7 @@
* Return checked and loaded header.
* @param fd file handle
* @retval hdrp address of header (or NULL)
- * @retval *msg verification error message (or NULL)
+ * @retval msg *msg verification error message (or NULL)
* @return RPMRC_OK on success
*/
static rpmRC rpmReadHeader(FD_t fd, /*@null@*/ Header * hdrp,
@@ -1611,8 +1611,8 @@
/**
* Read metadata header.
* @param fd file handle
- * @retval *ptr metadata header (or NULL)
- * @retval *msg failure msg
+ * @retval ptr *ptr metadata header (or NULL)
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC rdHeader(FD_t fd, /*@out@*/ /*@null@*/ void * ptr,
@@ -1630,7 +1630,7 @@
* Write metadata header.
* @param fd file handle
* @param ptr metadata header
- * @retval *msg failure msg
+ * @retval msg *msg failure msg
* @return rpmRC return code
*/
static rpmRC wrHeader(FD_t fd, void * ptr,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.h
============================================================================
$ cvs diff -u -r1.19.4.1 -r1.19.4.2 pkgio.h
--- rpm/rpmdb/pkgio.h 24 Sep 2014 13:27:54 -0000 1.19.4.1
+++ rpm/rpmdb/pkgio.h 27 Sep 2014 15:52:34 -0000 1.19.4.2
@@ -24,7 +24,7 @@
* @param dig signature parameters container
* @param uh unloaded header blob
* @param uc no. of bytes in blob (or 0 to disable)
- * @retval *msg verification error message (or NULL)
+ * @retval msg *msg verification error message (or NULL)
* @return RPMRC_OK on success
*/
rpmRC headerCheck(pgpDig dig, const void * uh, size_t uc,
@@ -61,7 +61,7 @@
* @param fn item name
* @param fd file handle
* @param ptr item buffer
- * @retval *msg item check failure message
+ * @retval msg *msg item check failure message
* @return RPMRC_OK on success
*/
rpmRC rpmpkgWrite(const char * fn, FD_t fd, void * ptr, const char ** msg)
@@ -72,8 +72,8 @@
* Read item from file descriptor.
* @param fn item name
* @param fd file handle
- * @retval *ptr item buffer
- * @retval *msg item check failure message
+ * @retval ptr *ptr item buffer
+ * @retval msg *msg item check failure message
* @return RPMRC_OK on success
*/
rpmRC rpmpkgRead(const char * fn, FD_t fd, /*@null@*/ /*@out@*/ void * ptr,
@@ -86,7 +86,7 @@
* @param fn item name
* @param fd file handle
* @param ptr item buffer
- * @retval *msg item check failure message
+ * @retval msg *msg item check failure message
* @return RPMRC_OK on success
*/
rpmRC rpmpkgCheck(const char * fn, FD_t fd, const void * ptr, const char ** msg)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.26 -r1.392.2.27 rpmdb.c
--- rpm/rpmdb/rpmdb.c 24 Sep 2014 13:27:54 -0000 1.392.2.26
+++ rpm/rpmdb/rpmdb.c 27 Sep 2014 15:52:34 -0000 1.392.2.27
@@ -787,14 +787,14 @@
return db;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
int rpmdbOpenAll(rpmdb db)
{
int rc = 0;
if (db == NULL) return -2;
-#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++) {
@@ -820,9 +820,9 @@
(void) dbiOpen(db, db->db_tags[dbix].tag, db->db_flags);
}
}
-#pragma GCC diagnostic pop
return rc;
}
+#pragma GCC diagnostic pop
int rpmdbBlockDBI(rpmdb db, int tag)
{
@@ -1006,6 +1006,8 @@
#define _DB_ERRPFX "rpmdb"
/*@-exportheader -globs -mods @*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
/*@only@*/ /*@null@*/
rpmdb rpmdbNew(/*@kept@*/ /*@null@*/ const char * root,
/*@kept@*/ /*@null@*/ const char * home,
@@ -1120,8 +1122,6 @@
db->db_api = _dbapi;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
{ size_t dbix;
rc = 0;
@@ -1166,7 +1166,6 @@
}
}
}
-#pragma GCC diagnostic pop
exit:
if (rc || dbp == NULL)
@@ -1179,6 +1178,7 @@
return rc;
}
+#pragma GCC diagnostic pop
/* XXX python/rpmmodule.c */
int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, mode_t perms)
@@ -2499,6 +2499,8 @@
}
/*@-dependenttrans -exposetrans -globstate @*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
rpmmi rpmmiInit(rpmdb db, rpmTag tag, const void * keyp, size_t keylen)
{
HE_t he = (HE_t) memset(alloca(sizeof(*he)), 0, sizeof(*he));
@@ -2513,8 +2515,6 @@
(void) rpmdbCheckSignals();
/* XXX Control for whether patterns are permitted. */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
default: break;
case 2: /* XXX HACK to remove RPMDBI_LABEL from RPM. */
@@ -2548,7 +2548,6 @@
usePatterns = 1;
break;
}
-#pragma GCC diagnostic pop
dbi = dbiOpen(db, tag, 0);
#ifdef NOTYET /* XXX non-configured tag indices force NULL return */
@@ -2780,8 +2779,11 @@
exit:
return mi;
}
+#pragma GCC diagnostic pop
/*@=dependenttrans =exposetrans =globstate @*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
/* XXX psm.c */
int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, uint32_t hdrNum,
/*@unused@*/ rpmts ts)
@@ -2835,8 +2837,6 @@
(void) memset(he, 0, sizeof(*he));
he->tag = dbiTag->tag;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (he->tag) {
default:
/* Don't bother if tag is not present. */
@@ -2883,7 +2883,6 @@
/*@switchbreak@*/ break;
}
-#pragma GCC diagnostic pop
} while (dbix-- > 0);
@@ -2896,8 +2895,11 @@
(void) unblockSignals(db, &signalMask);
return rc;
}
+#pragma GCC diagnostic pop
/* XXX install.c */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
int rpmdbAdd(rpmdb db, int iid, Header h, /*@unused@*/ rpmts ts)
{
HE_t he = (HE_t) memset(alloca(sizeof(*he)), 0, sizeof(*he));
@@ -2975,8 +2977,6 @@
(void) memset(he, 0, sizeof(*he));
he->tag = dbiTag->tag;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (he->tag) {
default:
/* Don't bother if tag is not present. */
@@ -3029,7 +3029,6 @@
v.size = 0;
/*@switchbreak@*/ break;
}
-#pragma GCC diagnostic pop
} while (dbix-- > 0);
rc = RPMRC_OK; /* XXX RPMRC */
@@ -3038,3 +3037,4 @@
(void) unblockSignals(db, &signalMask);
return rc;
}
+#pragma GCC diagnostic pop
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdpkg.h
============================================================================
$ cvs diff -u -r1.2.8.2 -r1.2.8.3 rpmdpkg.h
--- rpm/rpmdb/rpmdpkg.h 24 Sep 2014 13:27:54 -0000 1.2.8.2
+++ rpm/rpmdb/rpmdpkg.h 27 Sep 2014 15:52:36 -0000 1.2.8.3
@@ -32,7 +32,7 @@
/** \ingroup rpmds
* Split EVR string into epoch, version, and release components.
* @param evrstr [epoch:]version[-release] string
- * @retval *evr parse results
+ * @retval evr *evr parse results
* @return 0 always
*/
int dpkgEVRparse(const char * evrstr, EVR_t evr)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmevr.h
============================================================================
$ cvs diff -u -r1.11.4.3 -r1.11.4.4 rpmevr.h
--- rpm/rpmdb/rpmevr.h 19 Jul 2014 23:31:40 -0000 1.11.4.3
+++ rpm/rpmdb/rpmevr.h 27 Sep 2014 15:52:36 -0000 1.11.4.4
@@ -143,6 +143,8 @@
EVR_t rpmEVRfree(/*@only@*/ EVR_t evr)
/*@modifies evr @*/;
+extern int (*rpmvercmp)(const char *a, const char *b)
+ /*@*/;
/** \ingroup rpmds
* Segmented string compare.
* @param a 1st string
@@ -155,7 +157,7 @@
/** \ingroup rpmds
* Split EVR string into epoch, version, and release components.
* @param evrstr [epoch:]version[-release] string
- * @retval *evr parse results
+ * @retval evr *evr parse results
* @return 0 always
*/
int rpmEVRparse(const char * evrstr, EVR_t evr)
@@ -179,19 +181,10 @@
int rpmEVRoverlap(EVR_t a, EVR_t b)
/*@*/;
-/** \ingroup rpmds
- * Segmented string compare vector.
- * @param a 1st string
- * @param b 2nd string
- * @return +1 if a is "newer", 0 if equal, -1 if b is "newer"
- */
-extern int (*rpmvercmp)(const char *a, const char *b)
- /*@*/;
-
/**
* Return comparison operator sense flags.
* @param op operator string (NULL or "" uses RPMSENSE_EQUAL)
- * @param *end pointer to 1st character after operator (or NULL)
+ * @param end *end pointer to 1st character after operator (or NULL)
* @return sense flags
*/
rpmsenseFlags rpmEVRflags(/*@null@*/const char *op, /*@null@*/const char **end)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
============================================================================
$ cvs diff -u -r1.70.4.14 -r1.70.4.15 rpmtag.h
--- rpm/rpmdb/rpmtag.h 24 Sep 2014 13:27:54 -0000 1.70.4.14
+++ rpm/rpmdb/rpmtag.h 27 Sep 2014 15:52:36 -0000 1.70.4.15
@@ -1065,8 +1065,8 @@
/** \ingroup header
* Return header magic.
* @param h header
- * @param *magicp magic array
- * @param *nmagicp no. bytes of magic
+ * @param magicp *magicp magic array
+ * @param nmagicp *nmagicp no. bytes of magic
* @return 0 always
*/
int headerGetMagic(/*@null@*/ Header h, unsigned char **magicp, size_t *nmagicp)
@@ -1145,6 +1145,7 @@
* @return header stat(2) buffer
*/
struct stat * headerGetStatbuf(/*@null@*/ Header h)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup header
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtd.c
============================================================================
$ cvs diff -u -r1.11.6.7 -r1.11.6.8 rpmtd.c
--- rpm/rpmdb/rpmtd.c 24 Sep 2014 13:27:54 -0000 1.11.6.7
+++ rpm/rpmdb/rpmtd.c 27 Sep 2014 15:52:36 -0000 1.11.6.8
@@ -22,12 +22,12 @@
#define rpmHeaderFormats headerCompoundFormats
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
rpmTagClass rpmTagTypeGetClass(rpmTagType type)
{
rpmTagClass class;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (type & RPM_MASK_TYPE) {
case RPM_CHAR_TYPE:
case RPM_INT8_TYPE:
@@ -52,10 +52,10 @@
class = RPM_NULL_CLASS;
break;
}
-#pragma GCC diagnostic pop
return class;
}
+#pragma GCC diagnostic pop
rpmTagClass rpmTagGetClass(rpmTag tag)
{
@@ -331,14 +331,14 @@
return str;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
uint64_t rpmtdGetNumber(rpmtd td)
{
uint64_t val = 0;
int ix = (td->ix >= 0 ? td->ix : 0);
assert(td != NULL);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (td->type) {
case RPM_INT64_TYPE:
val = *((uint64_t *) td->data + ix);
@@ -356,10 +356,10 @@
default:
break;
}
-#pragma GCC diagnostic pop
return val;
}
+#pragma GCC diagnostic pop
char *rpmtdFormat(rpmtd td, rpmtdFormats fmt, const char *errmsg)
{
@@ -426,6 +426,8 @@
return 1;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
int rpmtdFromUint8(rpmtd td, rpmTag tag, uint8_t *data, uint32_t count)
{
rpmTagType type = rpmTagGetType(tag) & RPM_MASK_TYPE;
@@ -439,8 +441,6 @@
* treated specially otherwise.
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (type) {
case RPM_CHAR_TYPE:
case RPM_INT8_TYPE:
@@ -452,10 +452,10 @@
default:
return 0;
}
-#pragma GCC diagnostic pop
return rpmtdSet(td, tag, type, data, count);
}
+#pragma GCC diagnostic pop
int rpmtdFromUint16(rpmtd td, rpmTag tag, uint16_t *data, uint32_t count)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtd.h
============================================================================
$ cvs diff -u -r1.8.6.2 -r1.8.6.3 rpmtd.h
--- rpm/rpmdb/rpmtd.h 24 Sep 2014 13:27:54 -0000 1.8.6.2
+++ rpm/rpmdb/rpmtd.h 27 Sep 2014 15:52:36 -0000 1.8.6.3
@@ -20,7 +20,8 @@
RPM_BINARY_CLASS = 3,
} rpmTagClass;
-rpmTagClass rpmTagTypeGetClass(rpmTagType type);
+rpmTagClass rpmTagTypeGetClass(rpmTagType type)
+ RPM_GNUC_CONST;
rpmTagClass rpmTagGetClass(rpmTag tag);
typedef enum rpmtdFlags_e {
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.44.4.17 -r1.44.4.18 sqlite.c
--- rpm/rpmdb/sqlite.c 24 Sep 2014 13:05:08 -0000 1.44.4.17
+++ rpm/rpmdb/sqlite.c 27 Sep 2014 15:52:36 -0000 1.44.4.18
@@ -659,6 +659,8 @@
return rc;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static int sql_bind_key(dbiIndex dbi, SCP_t scp, int pos, DBT * key)
/*@modifies dbi, scp @*/
{
@@ -666,8 +668,6 @@
assert(key->data != NULL);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (dbi->dbi_rpmtag) {
case RPMDBI_PACKAGES:
{ unsigned int hnum;
@@ -726,10 +726,10 @@
/*@innerbreak@*/ break;
}
}
-#pragma GCC diagnostic pop
return rc;
}
+#pragma GCC diagnostic pop
static int sql_bind_data(/*@unused@*/ dbiIndex dbi, SCP_t scp,
int pos, DBT * data)
@@ -913,6 +913,8 @@
*
* Create the table.. create the db_info
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static int sql_initDB(dbiIndex dbi)
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies internalState @*/
@@ -1022,8 +1024,6 @@
const char * keytype;
int kt;
-#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);
@@ -1037,7 +1037,6 @@
keytype = tagTypes[(kt > 0 && kt < (int)ntagTypes ? kt : 0)];
break;
}
-#pragma GCC diagnostic pop
if (keytype) {
/* XXX no need for IF NOT EXISTS */
@@ -1057,6 +1056,7 @@
SQLDBDEBUG(dbi, (stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, dbi, rc));
return rc;
}
+#pragma GCC diagnostic pop
/**
* Close database cursor.
@@ -1398,6 +1398,8 @@
* @param flags (unused)
* @return 0 on success
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static int sql_cget (dbiIndex dbi, /*@null@*/ DBC * dbcursor, DBT * key,
DBT * data, unsigned int flags)
/*@globals fileSystem, internalState @*/
@@ -1433,8 +1435,6 @@
assert(scp->cmd == NULL); /* XXX memleak prevention */
-#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;",
@@ -1445,7 +1445,6 @@
dbi->dbi_subfile);
break;
}
-#pragma GCC diagnostic pop
rc = cvtdberr(dbi, "sqlite3_prepare",
sqlite3_prepare(sqlI, scp->cmd,
@@ -1565,6 +1564,7 @@
SQLDBDEBUG(dbi, (stderr, "<-- %s(%p,%p,%p,%p,0x%x) rc %d subfile %s %s\n", \
__FUNCTION__, dbi, dbcursor, key, data, flags, rc, dbi->dbi_subfile, _KEYDATA(key, \
NULL, data, NULL))); return rc;
}
+#pragma GCC diagnostic pop
/**
* Store (key,data) pair using db->put or dbcursor->c_put.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/tagname.c
============================================================================
$ cvs diff -u -r1.34.2.10 -r1.34.2.11 tagname.c
--- rpm/rpmdb/tagname.c 24 Sep 2014 13:05:08 -0000 1.34.2.10
+++ rpm/rpmdb/tagname.c 27 Sep 2014 15:52:36 -0000 1.34.2.11
@@ -21,7 +21,7 @@
/**
* Load/sort arbitrary tags.
- * @retval *argvp arbitrary tag array
+ * @retval argvp *argvp arbitrary tag array
* @return 0 always
*/
static int tagLoadATags(/*@null@*/ ARGV_t * argvp,
@@ -51,8 +51,8 @@
/**
* Compare tag table entries by name.
- * @param *avp tag table entry a
- * @param *bvp tag table entry b
+ * @param avp *avp tag table entry a
+ * @param bvp *bvp tag table entry b
* @return comparison
*/
static int tagCmpName(const void * avp, const void * bvp)
@@ -65,8 +65,8 @@
/**
* Compare tag table entries by value.
- * @param *avp tag table entry a
- * @param *bvp tag table entry b
+ * @param avp *avp tag table entry a
+ * @param bvp *bvp tag table entry b
* @return comparison
*/
static int tagCmpValue(const void * avp, const void * bvp)
@@ -83,8 +83,8 @@
/**
* Load/sort a tag index.
- * @retval *ipp tag index
- * @retval *np no. of tags
+ * @retval ipp *ipp tag index
+ * @retval np *np no. of tags
* @param cmp sort compare routine
* @return 0 always
*/
@@ -186,6 +186,8 @@
/*@=compmempass@*/
/*@-mods@*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static const char * _tagName(rpmTag tag)
{
char * nameBuf;
@@ -209,8 +211,6 @@
nameBuf[0] = nameBuf[1] = '\0';
nameBufLen = _rpmTags.nameBufLen;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
strncpy(nameBuf, "Packages", nameBufLen);
@@ -297,7 +297,6 @@
}
break;
}
-#pragma GCC diagnostic pop
if (nameBuf[0] == '\0')
xx = snprintf(nameBuf, nameBufLen, "Tag_0x%08x", (unsigned) tag);
nameBuf[nameBufLen-1] = '\0';
@@ -305,8 +304,11 @@
return nameBuf;
/*@=globstate@*/
}
+#pragma GCC diagnostic pop
/*@=mods@*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
static unsigned int _tagType(rpmTag tag)
{
headerTagTableEntry t;
@@ -319,8 +321,6 @@
if (_rpmTags.byValue == NULL)
xx = tagLoadIndex(&_rpmTags.byValue, &_rpmTags.byValueSize, tagCmpValue);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
switch (tag) {
case RPMDBI_PACKAGES:
case RPMDBI_DEPCACHE:
@@ -363,10 +363,10 @@
}
break;
}
-#pragma GCC diagnostic pop
return 0;
}
+#pragma GCC diagnostic pop
static rpmTag _tagValue(const char * tagstr)
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic