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: 27-Sep-2014 17:53:47
Branch: rpm-5_4 Handle: 2014092715534303
Modified files: (Branch: rpm-5_4)
rpm/lib fsm.h order.c poptI.c psm.c query.c rpmds.c
rpmds.h rpmgi.c rpmluaext.h rpmrc.c rpmte.h
rpmts.c rpmts.h
Log:
- lib: -Wdocumentation fixes.
Summary:
Revision Changes Path
2.42.6.1 +1 -1 rpm/lib/fsm.h
2.8.2.8 +1 -1 rpm/lib/order.c
2.57.4.3 +2 -1 rpm/lib/poptI.c
2.399.2.18 +6 -6 rpm/lib/psm.c
2.216.2.13 +3 -7 rpm/lib/query.c
2.170.2.28 +3 -7 rpm/lib/rpmds.c
2.81.4.6 +9 -9 rpm/lib/rpmds.h
2.75.2.11 +3 -7 rpm/lib/rpmgi.c
2.1.10.1 +0 -1 rpm/lib/rpmluaext.h
2.289.4.6 +2 -2 rpm/lib/rpmrc.c
2.76.2.3 +3 -2 rpm/lib/rpmte.h
2.188.2.13 +3 -7 rpm/lib/rpmts.c
2.134.2.7 +11 -10 rpm/lib/rpmts.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.h
============================================================================
$ cvs diff -u -r2.42 -r2.42.6.1 fsm.h
--- rpm/lib/fsm.h 2 Aug 2008 00:38:04 -0000 2.42
+++ rpm/lib/fsm.h 27 Sep 2014 15:53:43 -0000 2.42.6.1
@@ -46,7 +46,7 @@
/**
* Load external data into file state machine.
* @param _fsm file state machine
- * @param goal
+ * @param goal goal
* @param afmt archive format (NULL uses cpio)
* @param _ts transaction set
* @param _fi transaction element file info
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/order.c
============================================================================
$ cvs diff -u -r2.8.2.7 -r2.8.2.8 order.c
--- rpm/lib/order.c 10 Sep 2014 20:10:05 -0000 2.8.2.7
+++ rpm/lib/order.c 27 Sep 2014 15:53:43 -0000 2.8.2.8
@@ -446,7 +446,7 @@
/**
* Record next "q <- p" relation (i.e. "p" requires "q").
* @param ts transaction set
- * @param al
+ * @param al al
* @param p predecessor (i.e. package that "Requires: q")
* @param requires relation
* @return 0 always
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptI.c
============================================================================
$ cvs diff -u -r2.57.4.2 -r2.57.4.3 poptI.c
--- rpm/lib/poptI.c 19 Apr 2012 17:26:06 -0000 2.57.4.2
+++ rpm/lib/poptI.c 27 Sep 2014 15:53:43 -0000 2.57.4.3
@@ -43,7 +43,8 @@
* @todo (CLI embedding) Use rpmlog/rpmlog instead of fprintf, remove exit.
* @param desc message
*/
-static void argerror(const char * desc) __attribute__((__noreturn__));
+static void argerror(const char * desc)
+ RPM_GNUC_NORETURN;
/*@exits@*/
static void argerror(const char * desc)
/*@globals stderr, fileSystem @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.399.2.17 -r2.399.2.18 psm.c
--- rpm/lib/psm.c 23 Sep 2014 18:31:08 -0000 2.399.2.17
+++ rpm/lib/psm.c 27 Sep 2014 15:53:43 -0000 2.399.2.18
@@ -446,7 +446,7 @@
/**
* Wait for child process to be reaped.
* @param psm package state machine data
- * @return
+ * @return exit code
*/
static pid_t psmWait(rpmpsm psm)
/*@globals fileSystem, internalState @*/
@@ -1264,9 +1264,9 @@
/**
* Execute triggers.
* @param psm package state machine data
- * @param sourceH
- * @param triggeredH
- * @param arg2
+ * @param sourceH sourceH
+ * @param triggeredH triggeredH
+ * @param arg2 arg2
* @return RPMRC_OK on success
*/
static rpmRC handleOneTrigger(const rpmpsm psm,
@@ -1939,7 +1939,7 @@
/**
* Save backward link(s) of an upgrade chain into a header.
* @param h header
- * @param *blink backward links
+ * @param blink *blink backward links
* @return 0 always
*/
static int hSaveBlinks(Header h, const struct rpmChainLink_s * blink)
@@ -1994,7 +1994,7 @@
/**
* Save forward link(s) of an upgrade chain into a header.
* @param h header
- * @param *flink forward links
+ * @param flink *flink forward links
* @return 0 always
*/
static int hSaveFlinks(Header h, const struct rpmChainLink_s * flink)
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.216.2.12 -r2.216.2.13 query.c
--- rpm/lib/query.c 22 Sep 2014 18:16:30 -0000 2.216.2.12
+++ rpm/lib/query.c 27 Sep 2014 15:53:43 -0000 2.216.2.13
@@ -200,6 +200,8 @@
*tep = te;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
int showQueryPackage(QVA_t qva, rpmts ts, Header h)
{
int scareMem = 0;
@@ -340,10 +342,6 @@
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:
@@ -370,9 +368,6 @@
/*@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 ",
@@ -432,6 +427,7 @@
JBJDEBUG((stderr, "<-- %s(%p,%p,%p) rc %d\n", __FUNCTION__, qva, ts, h, rc));
return rc;
}
+#pragma GCC diagnostic pop
static int rpmgiShowMatches(QVA_t qva, rpmts ts)
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.170.2.27 -r2.170.2.28 rpmds.c
--- rpm/lib/rpmds.c 22 Sep 2014 18:16:30 -0000 2.170.2.27
+++ rpm/lib/rpmds.c 27 Sep 2014 15:53:43 -0000 2.170.2.28
@@ -135,6 +135,8 @@
* @param tagN dependency set tag
* @return dependency set type string
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
/*@observer@*/
static const char * rpmdsTagName(rpmTag tagN)
/*@*/
@@ -154,17 +156,11 @@
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;
}
+#pragma GCC diagnostic pop
const char * rpmdsType(const rpmds ds)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.h
============================================================================
$ cvs diff -u -r2.81.4.5 -r2.81.4.6 rpmds.h
--- rpm/lib/rpmds.h 24 Sep 2014 14:51:51 -0000 2.81.4.5
+++ rpm/lib/rpmds.h 27 Sep 2014 15:53:43 -0000 2.81.4.6
@@ -622,7 +622,7 @@
* Extract ELF dependencies from a file.
* @param fn file name
* @param flags 1: skip provides 2: skip requires
- * @param *add add(arg, ds) saves next provide/require elf
dependency.
+ * @param add *add add(arg, ds) saves next provide/require
elf dependency.
* @param context add() callback context
* @return 0 on success
*/
@@ -630,13 +630,13 @@
int (*add) (void * context, rpmds ds), void * context)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
-#define RPMELF_FLAG_SKIPPROVIDES 0x1 /*<! rpmdsELF: skip provides */
-#define RPMELF_FLAG_SKIPREQUIRES 0x2 /*<! rpmdsELF: skip requires */
+#define RPMELF_FLAG_SKIPPROVIDES 0x1 /* rpmdsELF: skip provides */
+#define RPMELF_FLAG_SKIPREQUIRES 0x2 /* rpmdsELF: skip requires */
/** \ingroup rpmds
* Load /etc/ld.so.cache provides into a dependency set.
* @todo Add dependency colors, and attach to file.
- * @retval *PRCO provides/requires/conflicts/obsoletes depedency set(s)
+ * @retval PRCO *PRCO provides/requires/conflicts/obsoletes
depedency set(s)
* @param fn cache file name (NULL uses /etc/ld.so.cache)
* @return 0 on success
*/
@@ -650,7 +650,7 @@
* directories for (ELF or ELF64) shared objects, and load the provided
* shared objects into a dependency set.
* @todo Add dependency colors, and attach to file.
- * @retval *PRCO provides/requires/conflicts/obsoletes depedency set(s)
+ * @retval PRCO *PRCO provides/requires/conflicts/obsoletes
depedency set(s)
* @param rldp :-sep string of dirs (NULL uses /lib:/usr/lib)
* @return 0 on success
*/
@@ -662,7 +662,7 @@
* Use Solaris' crle(1) command to find the ELF (or ELF64) loader path.
* calls rpmdsRldpath once it has the loader path.
* @todo Add dependency colors, and attach to file.
- * @retval *PRCO provides/requires/conflicts/obsoletes depedency set(s)
+ * @retval PRCO *PRCO provides/requires/conflicts/obsoletes
depedency set(s)
* @param fn unused.
* @return 0 on success
*/
@@ -671,20 +671,20 @@
/*@modifies *PRCO, rpmGlobalMacroContext, fileSystem, internalState @*/;
#endif
+struct utsname;
/** \ingroup rpmds
* Load uname(2) provides into a dependency set.
- * @retval *dsp (loaded) depedency set
+ * @retval dsp *dsp (loaded) depedency set
* @param un utsname struct (NULL calls uname(2))
* @return 0 on success
*/
-struct utsname;
int rpmdsUname(rpmds * dsp, /*@null@*/ const struct utsname * un)
/*@globals internalState @*/
/*@modifies *dsp, internalState @*/;
/** \ingroup rpmds
* Load provides from a pipe into a dependency set.
- * @retval *dsp (loaded) depedency set
+ * @retval dsp *dsp (loaded) depedency set
* @param tagN rpmds tag (0 uses RPMTAG_PROVIDENAME).
* @param cmd popen cmd to run (NULL loads perl provides)
* @return 0 on success
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.75.2.10 -r2.75.2.11 rpmgi.c
--- rpm/lib/rpmgi.c 22 Sep 2014 18:16:30 -0000 2.75.2.10
+++ rpm/lib/rpmgi.c 27 Sep 2014 15:53:43 -0000 2.75.2.11
@@ -581,6 +581,8 @@
/*@observer@*/ /*@unchecked@*/
static const char * _query_hdlist_path = "/usr/share/comps/%{_arch}/hdlist";
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
rpmRC rpmgiNext(/*@null@*/ rpmgi gi)
{
char hnum[32];
@@ -599,10 +601,6 @@
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:
@@ -775,9 +773,6 @@
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. */
@@ -840,6 +835,7 @@
fprintf(stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, gi, rpmrc);
return rpmrc;
}
+#pragma GCC diagnostic pop
rpmgiFlags rpmgiGetFlags(rpmgi gi)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmluaext.h
============================================================================
$ cvs diff -u -r2.1 -r2.1.10.1 rpmluaext.h
--- rpm/lib/rpmluaext.h 1 Jan 2008 20:52:22 -0000 2.1
+++ rpm/lib/rpmluaext.h 27 Sep 2014 15:53:43 -0000 2.1.10.1
@@ -12,7 +12,6 @@
/** \ingroup rpmluaext
* Add RPM _library_ based Lua extension
* @param lua Lua context
- * @return none
*/
void rpmluaextActivate(rpmlua lua)
/*@*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.289.4.5 -r2.289.4.6 rpmrc.c
--- rpm/lib/rpmrc.c 18 Sep 2014 05:07:01 -0000 2.289.4.5
+++ rpm/lib/rpmrc.c 27 Sep 2014 15:53:43 -0000 2.289.4.6
@@ -811,8 +811,8 @@
* @deprecated Use addMacro to set _target_* macros.
* @todo Eliminate in rpm-5.1.
# @note Only used by build code.
- * @param archTable
- * @param osTable
+ * @param archTable archTable
+ * @param osTable osTable
*/
static void rpmSetTables(int archTable, int osTable)
/*@globals currTables, rpmGlobalMacroContext, h_errno,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.h
============================================================================
$ cvs diff -u -r2.76.2.2 -r2.76.2.3 rpmte.h
--- rpm/lib/rpmte.h 24 Sep 2014 14:51:51 -0000 2.76.2.2
+++ rpm/lib/rpmte.h 27 Sep 2014 15:53:45 -0000 2.76.2.3
@@ -354,7 +354,7 @@
*/
/*@observer@*/ /*@null@*/
extern const char * rpmteD(rpmte te)
- RPM_GNUC_PURE
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmte
@@ -417,7 +417,6 @@
* Set last instance installed to the database.
* @param te transaction element
* @param instance Database instance of last install element.
- * @return last install instance.
*/
void rpmteSetDBInstance(rpmte te, unsigned int instance)
/*@modifies te @*/;
@@ -439,6 +438,7 @@
*/
/*@observer@*/
rpmuint32_t * rpmteOriginTid(rpmte te)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmte
@@ -448,6 +448,7 @@
*/
/*@observer@*/
rpmuint32_t * rpmteOriginTime(rpmte te)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmte
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.188.2.12 -r2.188.2.13 rpmts.c
--- rpm/lib/rpmts.c 22 Sep 2014 18:16:30 -0000 2.188.2.12
+++ rpm/lib/rpmts.c 27 Sep 2014 15:53:45 -0000 2.188.2.13
@@ -134,6 +134,8 @@
return rc;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
int rpmtsRebuildDB(rpmts ts)
{
void * lock = rpmtsAcquireLock(ts);
@@ -171,10 +173,6 @@
/* 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:
@@ -186,9 +184,6 @@
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, "/",
@@ -232,6 +227,7 @@
lock = rpmtsFreeLock(lock);
return rc;
}
+#pragma GCC diagnostic pop
/*@-compdef@*/ /* keyp might not be defined. */
rpmmi rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.134.2.6 -r2.134.2.7 rpmts.h
--- rpm/lib/rpmts.h 24 Sep 2014 14:51:51 -0000 2.134.2.6
+++ rpm/lib/rpmts.h 27 Sep 2014 15:53:46 -0000 2.134.2.7
@@ -333,6 +333,9 @@
extern "C" {
#endif
+extern int (*rpmtsCheck) (rpmts ts)
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
/** \ingroup rpmts
* Perform dependency resolution on the transaction set.
*
@@ -343,13 +346,13 @@
* @param ts transaction set
* @return 0 = deps ok, 1 = dep problems, 2 = error
*/
-extern int (*rpmtsCheck) (rpmts ts)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
int _rpmtsCheck(rpmts ts)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
+extern int (*rpmtsOrder) (rpmts ts)
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
/** \ingroup rpmts
* Determine package order in a transaction set according to dependencies.
*
@@ -366,9 +369,6 @@
* @param ts transaction set
* @return no. of (added) packages that could not be ordered
*/
-extern int (*rpmtsOrder) (rpmts ts)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
int _rpmtsOrder(rpmts ts)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ -376,6 +376,9 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
+extern int (*rpmtsRun) (rpmts ts, rpmps okProbs, rpmprobFilterFlags
ignoreSet)
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
/** \ingroup rpmts
* Process all package elements in a transaction set. Before calling
* rpmtsRun be sure to have:
@@ -393,9 +396,6 @@
* @param ignoreSet bits to filter problem types
* @return 0 on success, -1 on error, >0 with newProbs set
*/
-extern int (*rpmtsRun) (rpmts ts, rpmps okProbs, rpmprobFilterFlags
ignoreSet)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
int _rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
@@ -570,7 +570,7 @@
/** \ingroup rpmts
* Set dependency solver callback.
* @param ts transaction set
- * @param (*solve) dependency solver callback
+ * @param solve (*solve) dependency solver callback
* @param solveData dependency solver callback data (opaque)
* @return 0 on success
*/
@@ -1083,6 +1083,7 @@
*/
/*@relnull@*/
rpmop rpmtsOp(rpmts ts, rpmtsOpX opx)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmts
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
