[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm-5_4: rpm/rpmio/ Makefile.am ar.h argv.h bson.h cpio.h c...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2014-09-27 15:51:27
Message-ID: 20140927155127.49B777CAD6 () 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:51:27
Branch: rpm-5_4 Handle: 2014092715512104
Added files: (Branch: rpm-5_4)
rpm/rpmio rpmutil.h
Modified files: (Branch: rpm-5_4)
rpm/rpmio Makefile.am ar.h argv.h bson.h cpio.h crc.h iosm.h
lookup3.c macro.c md2.h mire.h mongo.c mongo.h
rpmbc.h rpmbf.h rpmcudf.h rpmficl.h rpmgit.c
rpmgit.h rpmio.h rpmiotypes.h rpmjni.h rpmjs.h
rpmlog.c rpmlog.h rpmmacro.h rpmmrb.h rpmperl.h
rpmpgp.h rpmpython.h rpmruby.h rpmsq.h rpmsql.c
rpmsql.h rpmsquirrel.h rpmsvn.c rpmsw.c rpmsw.h
rpmtcl.h rpmtpm.c rpmxar.h salsa10.h salsa20.h
tar.h tiger.h ttpm.c
Log:
- rpmio: -Wdocumentation fixes.
Summary:
Revision Changes Path
1.293.2.38 +2 -1 rpm/rpmio/Makefile.am
1.5.8.1 +3 -3 rpm/rpmio/ar.h
1.17.4.4 +1 -0 rpm/rpmio/argv.h
2.3.4.8 +10 -9 rpm/rpmio/bson.h
1.5.8.1 +2 -2 rpm/rpmio/cpio.h
2.1.6.2 +1 -0 rpm/rpmio/crc.h
1.18.4.4 +8 -3 rpm/rpmio/iosm.h
1.6.6.6 +3 -4 rpm/rpmio/lookup3.c
2.249.2.24 +1 -1 rpm/rpmio/macro.c
1.3.10.1 +2 -2 rpm/rpmio/md2.h
1.32.4.2 +1 -1 rpm/rpmio/mire.h
2.3.4.10 +13 -7 rpm/rpmio/mongo.c
2.2.4.7 +22 -15 rpm/rpmio/mongo.h
2.14.2.7 +7 -0 rpm/rpmio/rpmbc.h
2.8.4.3 +5 -5 rpm/rpmio/rpmbf.h
2.6.2.1 +9 -0 rpm/rpmio/rpmcudf.h
2.6.2.1 +2 -2 rpm/rpmio/rpmficl.h
2.1.2.51 +9 -12 rpm/rpmio/rpmgit.c
2.1.2.24 +1 -4 rpm/rpmio/rpmgit.h
1.97.2.5 +13 -5 rpm/rpmio/rpmio.h
1.47.2.20 +1 -1 rpm/rpmio/rpmiotypes.h
1.1.2.2 +1 -1 rpm/rpmio/rpmjni.h
1.10.2.1 +2 -2 rpm/rpmio/rpmjs.h
2.46.4.6 +2 -2 rpm/rpmio/rpmlog.c
2.24.4.3 +4 -3 rpm/rpmio/rpmlog.h
2.56.4.8 +6 -14 rpm/rpmio/rpmmacro.h
1.1.2.2 +1 -1 rpm/rpmio/rpmmrb.h
2.9.2.1 +1 -1 rpm/rpmio/rpmperl.h
2.108.2.15 +3 -0 rpm/rpmio/rpmpgp.h
2.10.2.2 +2 -2 rpm/rpmio/rpmpython.h
2.10.2.1 +1 -1 rpm/rpmio/rpmruby.h
1.14.6.3 +1 -0 rpm/rpmio/rpmsq.h
2.59.2.13 +117 -121 rpm/rpmio/rpmsql.c
2.27.4.8 +13 -13 rpm/rpmio/rpmsql.h
2.6.2.2 +2 -2 rpm/rpmio/rpmsquirrel.h
2.1.2.5 +7 -0 rpm/rpmio/rpmsvn.c
2.20.4.1 +2 -2 rpm/rpmio/rpmsw.c
2.12.4.3 +3 -3 rpm/rpmio/rpmsw.h
2.13.2.1 +2 -2 rpm/rpmio/rpmtcl.h
1.5.2.20 +4 -4 rpm/rpmio/rpmtpm.c
1.1.2.1 +118 -0 rpm/rpmio/rpmutil.h
2.15.4.1 +1 -0 rpm/rpmio/rpmxar.h
1.3.10.1 +2 -2 rpm/rpmio/salsa10.h
1.3.10.1 +2 -2 rpm/rpmio/salsa20.h
1.4.8.2 +2 -2 rpm/rpmio/tar.h
1.3.10.1 +2 -2 rpm/rpmio/tiger.h
2.6.2.4 +2 -0 rpm/rpmio/ttpm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.37 -r1.293.2.38 Makefile.am
--- rpm/rpmio/Makefile.am 21 Sep 2014 06:52:53 -0000 1.293.2.37
+++ rpm/rpmio/Makefile.am 27 Sep 2014 15:51:21 -0000 1.293.2.38
@@ -118,7 +118,8 @@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = argv.h mire.h rpmzlog.h yarn.h \
- rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h rpmpgp.h rpmsw.h
+ rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h
+ rpmpgp.h rpmsw.h rpmutil.h
noinst_HEADERS = \
ar.h bson.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \
blake2.h blake2-impl.h blake2-rpm.h blake2-kat.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ar.h
============================================================================
$ cvs diff -u -r1.5 -r1.5.8.1 ar.h
--- rpm/rpmio/ar.h 10 Mar 2008 21:18:07 -0000 1.5
+++ rpm/rpmio/ar.h 27 Sep 2014 15:51:21 -0000 1.5.8.1
@@ -37,7 +37,7 @@
/**
* Read ar(1) header.
* @retval _iosm file path and stat info
- * @retval st
+ * @param st stat(2) buffer
* @return 0 on success
*/
int arHeaderRead(void * _iosm, struct stat * st)
@@ -46,8 +46,8 @@
/**
* Write ar(1) header.
- * @retval _iosm file path and stat info
- * @param st
+ * @retval _iosm file path and stat info
+ * @param st stat(2) buffer
* @return 0 on success
*/
int arHeaderWrite(void * _iosm, struct stat * st)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/argv.h
============================================================================
$ cvs diff -u -r1.17.4.3 -r1.17.4.4 argv.h
--- rpm/rpmio/argv.h 24 Sep 2014 13:03:03 -0000 1.17.4.3
+++ rpm/rpmio/argv.h 27 Sep 2014 15:51:21 -0000 1.17.4.4
@@ -85,6 +85,7 @@
*/
/*@null@*/
ARGV_t argvData(/*@null@*/ ARGV_t argv)
+ RPM_GNUC_CONST
/*@*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/bson.h
============================================================================
$ cvs diff -u -r2.3.4.7 -r2.3.4.8 bson.h
--- rpm/rpmio/bson.h 24 Sep 2014 13:03:03 -0000 2.3.4.7
+++ rpm/rpmio/bson.h 27 Sep 2014 15:51:21 -0000 2.3.4.8
@@ -279,7 +279,7 @@
* Initialize a bson_iterator.
*
* @param i the bson_iterator to initialize.
- * @param bson the BSON object to associate with the iterator.
+ * @param b the BSON object to associate with the iterator.
*/
MONGO_EXPORT void bson_iterator_init( bson_iterator *i , const bson *b );
@@ -691,7 +691,7 @@
*
* @param b the BSON object to initialize.
* @param data the raw BSON data.
- * @param dataSize
+ * @param dataSize no. of octets
* @param ownsData when true, bson_ensure_space() may reallocate the block and
* bson_destroy() will free it
*
@@ -749,7 +749,8 @@
*
* @return the shared initialized BSON object.
*/
-MONGO_EXPORT const bson *bson_shared_empty( void );
+MONGO_EXPORT const bson *bson_shared_empty( void )
+ RPM_GNUC_CONST;
/**
* Make a complete copy of the a BSON object.
@@ -867,7 +868,6 @@
* @param b the bson to append to.
* @param name the key for the code.
* @param str the code to append.
- * @param len the number of bytes from str to append.
*
* @return BSON_OK or BSON_ERROR.
*/
@@ -890,7 +890,7 @@
*
* @param b the bson to append to.
* @param name the key for the code.
- * @param str the string to append.
+ * @param code the string to append.
* @param scope a BSON object containing the scope.
*
* @return BSON_OK or BSON_ERROR.
@@ -902,8 +902,8 @@
*
* @param b the bson to append to.
* @param name the key for the code.
- * @param str the string to append.
- * @param len the number of bytes from str to append.
+ * @param code the string to append.
+ * @param size the number of bytes from str to append.
* @param scope a BSON object containing the scope.
*
* @return BSON_OK or BSON_ERROR.
@@ -980,7 +980,7 @@
* @param b the bson to append to.
* @param name the key for the regex value.
* @param pattern the regex pattern to append.
- * @param the regex options.
+ * @param opts the regex options.
*
* @return BSON_OK or BSON_ERROR.
*/
@@ -1168,7 +1168,8 @@
* certain environments.
*
*/
-MONGO_EXPORT double bson_int64_to_double( int64_t i64 );
+MONGO_EXPORT double bson_int64_to_double( int64_t i64 )
+ RPM_GNUC_CONST;
MONGO_EXPORT void bson_swap_endian32( void *outp, const void *inp );
MONGO_EXPORT void bson_swap_endian64( void *outp, const void *inp );
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/cpio.h
============================================================================
$ cvs diff -u -r1.5 -r1.5.8.1 cpio.h
--- rpm/rpmio/cpio.h 10 Mar 2008 21:18:07 -0000 1.5
+++ rpm/rpmio/cpio.h 27 Sep 2014 15:51:21 -0000 1.5.8.1
@@ -47,7 +47,7 @@
/**
* Read cpio header.
* @retval _iosm file path and stat info
- * @retval st
+ * @retval st stat(2) buffer
* @return 0 on success
*/
int cpioHeaderRead(void * _iosm, struct stat * st)
@@ -57,7 +57,7 @@
/**
* Write cpio header.
* @retval _iosm file path and stat info
- * @param st
+ * @param st stat(2) buffer
* @return 0 on success
*/
int cpioHeaderWrite(void * _iosm, struct stat * st)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/crc.h
============================================================================
$ cvs diff -u -r2.1.6.1 -r2.1.6.2 crc.h
--- rpm/rpmio/crc.h 24 Sep 2014 13:03:03 -0000 2.1.6.1
+++ rpm/rpmio/crc.h 27 Sep 2014 15:51:21 -0000 2.1.6.2
@@ -57,6 +57,7 @@
/**
*/
rpmuint32_t __adler32_combine(rpmuint32_t adler1, rpmuint32_t adler2, size_t len2)
+ RPM_GNUC_CONST
/*@*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.h
============================================================================
$ cvs diff -u -r1.18.4.3 -r1.18.4.4 iosm.h
--- rpm/rpmio/iosm.h 24 Sep 2014 13:03:03 -0000 1.18.4.3
+++ rpm/rpmio/iosm.h 27 Sep 2014 15:51:21 -0000 1.18.4.4
@@ -332,14 +332,18 @@
* @param a file stage
* @return formatted string
*/
-/*@observer@*/ const char * iosmFileStageString(iosmFileStage a) /*@*/;
+/*@observer@*/ const char * iosmFileStageString(iosmFileStage a)
+ RPM_GNUC_CONST
+ /*@*/;
/**
* Return formatted string representation of file disposition.
* @param a file disposition
* @return formatted string
*/
-/*@observer@*/ const char * iosmFileActionString(iosmFileAction a) /*@*/;
+/*@observer@*/ const char * iosmFileActionString(iosmFileAction a)
+ RPM_GNUC_CONST
+ /*@*/;
/*@=exportlocal@*/
/** \ingroup payload
@@ -371,7 +375,7 @@
/**
* Load external data into I/O state machine.
* @param iosm I/O state machine
- * @param goal
+ * @param goal goal
* @param afmt archive format (NULL uses cpio)
* @param _ts transaction set
* @param _fi transaction element file info
@@ -446,6 +450,7 @@
* @return Is file to be skipped?
*/
int iosmFileActionSkipped(iosmFileAction action)
+ RPM_GNUC_CONST
/*@*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/lookup3.c
============================================================================
$ cvs diff -u -r1.6.6.5 -r1.6.6.6 lookup3.c
--- rpm/rpmio/lookup3.c 5 Sep 2014 19:38:07 -0000 1.6.6.5
+++ rpm/rpmio/lookup3.c 27 Sep 2014 15:51:21 -0000 1.6.6.6
@@ -451,11 +451,10 @@
* the key. *pc is better mixed than *pb, so use *pc first. If you want
* a 64-bit value do something like "*pc + (((rpmuint64_t)*pb)<<32)".
*
- * @param h the previous hash, or an arbitrary value
- * @param *key the key, an array of rpmuint8_t values
+ * @param key *key the key, an array of rpmuint8_t values
* @param size the size of the key in bytes
- * @retval *pc, IN: primary initval, OUT: primary hash
- * *retval *pb IN: secondary initval, OUT: secondary hash
+ * @retval pc *pc IN: primary initval, OUT: primary hash
+ * *retval pb *pb IN: secondary initval, OUT: secondary hash
*/
void jlu32lpair(const void *key, size_t size, rpmuint32_t *pc, rpmuint32_t *pb)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.249.2.23 -r2.249.2.24 macro.c
--- rpm/rpmio/macro.c 24 Sep 2014 13:03:03 -0000 2.249.2.23
+++ rpm/rpmio/macro.c 27 Sep 2014 15:51:22 -0000 2.249.2.24
@@ -1331,7 +1331,7 @@
#endif
} else if (STREQ("url2path", f, fn) || STREQ("u2p", f, fn)) {
int ut = urlPath(buf, (const char **)&b);
- ut = ut; /* XXX quiet gcc */
+ (void)ut; /* XXX quiet gcc/clang */
if (*b == '\0') b = (char *) "/";
} else if (STREQ("uncompress", f, fn)) {
rpmCompressedMagic compressed = COMPRESSED_OTHER;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md2.h
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 md2.h
--- rpm/rpmio/md2.h 24 Jun 2007 10:27:21 -0000 1.3
+++ rpm/rpmio/md2.h 27 Sep 2014 15:51:22 -0000 1.3.10.1
@@ -74,8 +74,8 @@
* \brief This function should be used to pass successive blocks of data
* to be hashed.
* \param mp The hash function's parameter block.
- * \param data
- * \param size
+ * \param data octets
+ * \param size no. of octets
* \retval 0 on success.
*/
BEECRYPTAPI
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mire.h
============================================================================
$ cvs diff -u -r1.32.4.1 -r1.32.4.2 mire.h
--- rpm/rpmio/mire.h 20 Jul 2014 00:07:35 -0000 1.32.4.1
+++ rpm/rpmio/mire.h 27 Sep 2014 15:51:22 -0000 1.32.4.2
@@ -219,7 +219,7 @@
/**
* Initialize pattern execute options (PCRE only).
* @param mire pattern container
- * @param *offsets (PCRE only) string offset(s)
+ * @param offsets *offsets (PCRE only) string offset(s)
* @param noffsets (PCRE only) no. of string offsets
* @return 0 on success
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mongo.c
============================================================================
$ cvs diff -u -r2.3.4.9 -r2.3.4.10 mongo.c
--- rpm/rpmio/mongo.c 24 Sep 2014 13:03:03 -0000 2.3.4.9
+++ rpm/rpmio/mongo.c 27 Sep 2014 15:51:22 -0000 2.3.4.10
@@ -136,7 +136,7 @@
/**
* Destroys the GridFile
*
- * @param oGridFIle - the GridFile being destroyed
+ * @param gfile - the GridFile being destroyed
*/
MONGO_EXPORT void gridfile_destroy( gridfile *gfile );
@@ -147,6 +147,13 @@
* +-+-+-+- This modified version of GridFS allows the file to read/write randomly
* +-+-+-+- when using this function
*
+ * @param gfile - the GridFile
+ * @param gfs - the working GridFS
+ * @param remote_name - filename for use in the database
+ * @param content_type - optional MIME type for this object
+ * @param flags - flags
+ *
+ * @return - MONGO_OK or MONGO_ERROR.
*/
MONGO_EXPORT int gridfile_writer_init( gridfile *gfile, gridfs *gfs, const char *remote_name,
const char *content_type, int flags );
@@ -179,6 +186,7 @@
* @param length - length of the buffer
* @param remotename - filename for use in the database
* @param contenttype - optional MIME type for this object
+ * @param flags - flags
*
* @return - MONGO_OK or MONGO_ERROR.
*/
@@ -315,7 +323,7 @@
/**
* Returns the caseInsensitive flag value of gfs
- * @param gfile - the working GridFile
+ * @param gfs - the working gfs
*
* @return - the caseInsensitive flag of the gfs
*/
@@ -327,7 +335,6 @@
* @param gfs - the working gfs
* @param newValue - the new value for the caseInsensitive flag of gfs
*
- * @return - void
*/
MONGO_EXPORT void gridfs_set_caseInsensitive(gridfs *gfs, bson_bool_t newValue);
@@ -336,15 +343,13 @@
* @param gfile - the working GridFile
* @param flags - the value of the flags to set on the provided GridFile
*
- * @return - void
*/
MONGO_EXPORT void gridfile_set_flags(gridfile *gfile, int flags);
/**
* gets the flags of the GridFile
* @param gfile - the working GridFile
- *
- * @return - void
+ *
*/
MONGO_EXPORT int gridfile_get_flags( const gridfile *gfile )
RPM_GNUC_PURE;
@@ -387,8 +392,9 @@
/**
* Returns chunk n of GridFile
* @param gfile - the working GridFile
+ * @param n - chunk n
+ * @retval out - (*out) the BSON result
*
- * @return - the nth chunk of the Gridfile
*/
MONGO_EXPORT void gridfile_get_chunk( gridfile *gfile, int n, bson* out );
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mongo.h
============================================================================
$ cvs diff -u -r2.2.4.6 -r2.2.4.7 mongo.h
--- rpm/rpmio/mongo.h 24 Sep 2014 13:03:03 -0000 2.2.4.6
+++ rpm/rpmio/mongo.h 27 Sep 2014 15:51:22 -0000 2.2.4.7
@@ -224,7 +224,8 @@
/** Initialize sockets for Windows.
*/
-MONGO_EXPORT void mongo_init_sockets( void );
+MONGO_EXPORT void mongo_init_sockets( void )
+ RPM_GNUC_CONST;
/**
* Initialize a new mongo connection object. You must initialize each mongo
@@ -578,7 +579,7 @@
/**
* Initalize a new cursor object.
*
- * @param cursor
+ * @param cursor cursor
* @param ns the namespace, represented as the the database
* name and collection name separated by a dot. e.g., "test.users"
*/
@@ -589,7 +590,7 @@
* your query is the empty bson object "{}", then you need not
* set this value.
*
- * @param cursor
+ * @param cursor cursor
* @param query a bson object representing the query spec. This may
* be either a simple query spec or a complex spec storing values for
* $query, $orderby, $hint, and/or $explain. See
@@ -601,7 +602,7 @@
* Set the fields to return for this cursor. If you want to return
* all fields, you need not set this value.
*
- * @param cursor
+ * @param cursor cursor
* @param fields a bson object representing the fields to return.
* See http://www.mongodb.org/display/DOCS/Retrieving+a+Subset+of+Fields.
*/
@@ -610,23 +611,23 @@
/**
* Set the number of documents to skip.
*
- * @param cursor
- * @param skip
+ * @param cursor cursor
+ * @param skip skip
*/
MONGO_EXPORT void mongo_cursor_set_skip( mongo_cursor *cursor, int skip );
/**
* Set the number of documents to return.
*
- * @param cursor
- * @param limit
+ * @param cursor cursor
+ * @param limit limit
*/
MONGO_EXPORT void mongo_cursor_set_limit( mongo_cursor *cursor, int limit );
/**
* Set any of the available query options (e.g., MONGO_TAILABLE).
*
- * @param cursor
+ * @param cursor cursor
* @param options a bitfield storing query options. See
* mongo_cursor_bitfield_t for available constants.
*/
@@ -636,7 +637,7 @@
* Return the current BSON object data as a const char*. This is useful
* for creating bson iterators with bson_iterator_init.
*
- * @param cursor
+ * @param cursor cursor
*/
MONGO_EXPORT const char *mongo_cursor_data( mongo_cursor *cursor )
RPM_GNUC_PURE;
@@ -645,15 +646,16 @@
* Return the current BSON object data as a const char*. This is useful
* for creating bson iterators with bson_iterator_init.
*
- * @param cursor
+ * @param cursor cursor
*/
-MONGO_EXPORT const bson *mongo_cursor_bson( mongo_cursor *cursor );
+MONGO_EXPORT const bson *mongo_cursor_bson( mongo_cursor *cursor )
+ RPM_GNUC_CONST;
/**
* Iterate the cursor, returning the next item. When successful,
* the returned object will be stored in cursor->current;
*
- * @param cursor
+ * @param cursor cursor
*
* @return MONGO_OK. On error, returns MONGO_ERROR and sets
* cursor->err with a value of mongo_error_t.
@@ -745,13 +747,17 @@
* Create a capped collection.
*
* @param conn a mongo object.
- * @param ns the namespace (e.g., "dbname.collectioname")
+ * @param db the dbname (e.g., "dbname.collectioname")
+ * @param collection the collection (e.g., "dbname.collectioname")
* @param size the size of the capped collection in bytes.
* @param max the max number of documents this collection is
* allowed to contain. If zero, this argument will be ignored
* and the server will use the collection's size to age document out.
* If using this option, ensure that the total size can contain this
* number of documents.
+ * @retval out (*out) the BSON result of the command.
+ *
+ * @return MONGO_OK if the command ran without error.
*/
MONGO_EXPORT int mongo_create_capped_collection( mongo *conn, const char *db,
const char *collection, int size, int max, bson *out );
@@ -922,7 +928,8 @@
MONGO_EXPORT void mongo_cursor_dealloc(mongo_cursor* cursor);
MONGO_EXPORT int mongo_get_server_err(mongo* conn)
RPM_GNUC_PURE;
-MONGO_EXPORT const char* mongo_get_server_err_string(mongo* conn);
+MONGO_EXPORT const char* mongo_get_server_err_string(mongo* conn)
+ RPM_GNUC_CONST;
/**
* Set an error on a mongo connection object. Mostly for internal use.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.h
============================================================================
$ cvs diff -u -r2.14.2.6 -r2.14.2.7 rpmbc.h
--- rpm/rpmio/rpmbc.h 17 Sep 2014 03:36:21 -0000 2.14.2.6
+++ rpm/rpmio/rpmbc.h 27 Sep 2014 15:51:22 -0000 2.14.2.7
@@ -12,6 +12,10 @@
#include <rpmsw.h>
/* Drag in the beecrypt includes. */
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#endif
#include <beecrypt/beecrypt.h>
#include <beecrypt/base64.h>
#include <beecrypt/dsa.h>
@@ -31,6 +35,9 @@
#include <beecrypt/sha256.h>
#include <beecrypt/sha384.h>
#include <beecrypt/sha512.h>
+#if __clang__
+#pragma clang diagnostic pop
+#endif
/**
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbf.h
============================================================================
$ cvs diff -u -r2.8.4.2 -r2.8.4.3 rpmbf.h
--- rpm/rpmio/rpmbf.h 20 Jul 2014 00:08:10 -0000 2.8.4.2
+++ rpm/rpmio/rpmbf.h 27 Sep 2014 15:51:22 -0000 2.8.4.3
@@ -132,7 +132,7 @@
/**
* Add item to a Bloom filter.
* @param bf Bloom filter
- * @param *_s bytes
+ * @param _s *_s bytes
* @param ns no. bytes (0 uses strlen)
* @return 0 on success, -1 on NULL pointer
*/
@@ -150,7 +150,7 @@
/**
* Check for item in a Bloom filter.
* @param bf Bloom filter
- * @param *_s bytes
+ * @param _s *_s bytes
* @param ns no. bytes (0 uses strlen)
* @return 1 if string is present, 0 if not, -1 on NULL pointer
*/
@@ -161,7 +161,7 @@
* Delete item from a Bloom filter.
* @todo Counting bloom filter needed?
* @param bf Bloom filter
- * @param *_s bytes
+ * @param _s *_s bytes
* @param ns no. bytes (0 will do strlen)
* @return 0 on success, -1 on NULL pointer
*/
@@ -190,8 +190,8 @@
* Return optimal {m, k} for given n and e.
* @param n population estimate
* @param e probability of error
- * @retval *mp no. of bits
- * @retval *kp no. of hashes
+ * @retval mp *mp no. of bits
+ * @retval kp *kp no. of hashes
*/
void rpmbfParams(size_t n, double e, size_t * mp, size_t * kp)
/*@modifies *mp, *kp @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmcudf.h
============================================================================
$ cvs diff -u -r2.6 -r2.6.2.1 rpmcudf.h
--- rpm/rpmio/rpmcudf.h 7 Apr 2010 03:20:06 -0000 2.6
+++ rpm/rpmio/rpmcudf.h 27 Sep 2014 15:51:22 -0000 2.6.2.1
@@ -164,22 +164,31 @@
/*@modifies fileSystem, internalState @*/;
int rpmcudfHasPreamble(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
int rpmcudfHasRequest(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
int rpmcudfIsConsistent(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
int rpmcudfInstalledSize(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
int rpmcudfUniverseSize(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
void rpmcudfPrintPreamble(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
void rpmcudfPrintRequest(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
void rpmcudfPrintUniverse(rpmcudf cudf)
+ RPM_GNUC_CONST
/*@*/;
int rpmcudfIsSolution(rpmcudf X, rpmcudf Y)
+ RPM_GNUC_CONST
/*@*/;
#ifdef __cplusplus
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmficl.h
============================================================================
$ cvs diff -u -r2.6 -r2.6.2.1 rpmficl.h
--- rpm/rpmio/rpmficl.h 7 Apr 2010 03:20:06 -0000 2.6
+++ rpm/rpmio/rpmficl.h 27 Sep 2014 15:51:22 -0000 2.6.2.1
@@ -82,7 +82,7 @@
* Execute ficl from a file.
* @param ficl ficl interpreter (NULL uses global interpreter)
* @param fn ficl file to run (NULL returns RPMRC_FAIL)
- * @param *resultp ficl exec result
+ * @param resultp *resultp ficl exec result
* @return RPMRC_OK on success
*/
rpmRC rpmficlRunFile(rpmficl ficl, /*@null@*/ const char * fn,
@@ -94,7 +94,7 @@
* Execute ficl string.
* @param ficl ficl interpreter (NULL uses global interpreter)
* @param str ficl string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp ficl exec result
+ * @param resultp *resultp ficl exec result
* @return RPMRC_OK on success
*/
rpmRC rpmficlRun(rpmficl ficl, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.c
============================================================================
$ cvs diff -u -r2.1.2.50 -r2.1.2.51 rpmgit.c
--- rpm/rpmio/rpmgit.c 11 Sep 2014 18:19:47 -0000 2.1.2.50
+++ rpm/rpmio/rpmgit.c 27 Sep 2014 15:51:22 -0000 2.1.2.51
@@ -195,15 +195,13 @@
{
FILE * fp = (_fp ? _fp : stderr);
const git_oid * oidp = _oidp;
- char * t;
- if (oidp) {
- t = git_oid_allocfmt(oidp);
- git_oid_fmt(t, oidp);
- } else
- t = strdup("NULL");
+ char str[GIT_OID_HEXSZ+1];
+ if (oidp)
+ git_oid_nfmt(str, sizeof(str), oidp);
+ else
+ strcpy(str, "NULL");
if (msg) fprintf(fp, "%s:", msg);
-fprintf(fp, " %s\n", t);
- t = _free(t);
+fprintf(fp, " %s\n", str);
}
void rpmgitPrintTime(const char * msg, time_t _Ctime, void * _fp)
@@ -315,7 +313,7 @@
#endif
for (i = 0; i < Tcnt; i++) {
const git_tree_entry * E = git_tree_entry_byindex(T, i);
- char * t;
+ char str[GIT_OID_HEXSZ+1];
assert(E != NULL);
#ifdef DYING
fprintf(fp, " Eattrs: 0%o\n", git_tree_entry_filemode(E));
@@ -323,13 +321,12 @@
rpmgitPrintOid(" Eoid", git_tree_entry_id(E), fp);
fprintf(fp, " Etype: %s\n", rpmgitOtype(git_tree_entry_type(E)));
#else
- t = git_oid_allocfmt(git_tree_entry_id(E));
+ git_oid_nfmt(str, sizeof(str), git_tree_entry_id(E));
fprintf(fp, "%06o %.4s %s\t%s\n",
git_tree_entry_filemode(E),
git_object_type2string(git_tree_entry_type(E)),
- t,
+ str,
git_tree_entry_name(E));
- t = _free(t);
#endif
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.h
============================================================================
$ cvs diff -u -r2.1.2.23 -r2.1.2.24 rpmgit.h
--- rpm/rpmio/rpmgit.h 13 Apr 2014 22:28:39 -0000 2.1.2.23
+++ rpm/rpmio/rpmgit.h 27 Sep 2014 15:51:22 -0000 2.1.2.24
@@ -30,9 +30,6 @@
#if defined(HAVE_GIT2_H)
#include <git2.h>
-#include <git2/branch.h>
-#include <git2/config.h>
-#include <git2/errors.h>
#endif
/** \ingroup rpmio
@@ -156,7 +153,7 @@
* Execute git string.
* @param git git interpreter (NULL uses global interpreter)
* @param str git string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp git exec result
+ * @param resultp *resultp git exec result
* @return RPMRC_OK on success
*/
rpmRC rpmgitRun(rpmgit git, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
============================================================================
$ cvs diff -u -r1.97.2.4 -r1.97.2.5 rpmio.h
--- rpm/rpmio/rpmio.h 15 Sep 2014 07:51:40 -0000 1.97.2.4
+++ rpm/rpmio/rpmio.h 27 Sep 2014 15:51:23 -0000 1.97.2.5
@@ -491,6 +491,7 @@
* glob_error(3) clone.
*/
int Glob_error(const char * epath, int eerrno)
+ RPM_GNUC_CONST
/*@*/;
/**
@@ -645,15 +646,22 @@
/*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/;
+extern char * (*Getpass) (const char * prompt)
+ /*@*/;
+
/**
* Return a password.
* @param prompt prompt string
* @return password
*/
-extern char * (*Getpass) (const char * prompt)
- /*@*/;
char * _GetPass (const char * prompt)
/*@*/;
+
+/**
+ * Return a password.
+ * @param prompt prompt string
+ * @return password
+ */
char * _RequestPass (const char * prompt)
/*@*/;
@@ -786,9 +794,9 @@
* @param size item size
* @param limit no. of items permitted (-1 for unlimited)
* @param flags debugging flags
- * @param (*dbg)() generate string for Unlink/Link/Free debugging
- * @param (*init)() create item contents
- * @param (*fini)() destroy item contents
+ * @param dbg (*dbg)() generate string for Unlink/Link/Free debugging
+ * @param init (*init)() create item contents
+ * @param fini (*fini)() destroy item contents
* @return memory pool
*/
rpmioPool rpmioNewPool(/*@observer@*/ const char * name,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmiotypes.h
============================================================================
$ cvs diff -u -r1.47.2.19 -r1.47.2.20 rpmiotypes.h
--- rpm/rpmio/rpmiotypes.h 24 Sep 2014 13:03:04 -0000 1.47.2.19
+++ rpm/rpmio/rpmiotypes.h 27 Sep 2014 15:51:24 -0000 1.47.2.20
@@ -733,7 +733,7 @@
/**
* Parse next command out of a string incrementally.
- * @param *Pptr parser state
+ * @param Pptr *Pptr is parser state
* @param str string to parse
* @return RPMRC_OK on success
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjni.h
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmjni.h
--- rpm/rpmio/rpmjni.h 6 Aug 2014 20:42:36 -0000 1.1.2.1
+++ rpm/rpmio/rpmjni.h 27 Sep 2014 15:51:24 -0000 1.1.2.2
@@ -94,7 +94,7 @@
* Execute jni string.
* @param jni jni interpreter (NULL uses global interpreter)
* @param str jni string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp jni exec result
+ * @param resultp *resultp jni exec result
* @return RPMRC_OK on success
*/
rpmRC rpmjniRun(rpmjni jni, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs.h
============================================================================
$ cvs diff -u -r1.10 -r1.10.2.1 rpmjs.h
--- rpm/rpmio/rpmjs.h 12 Sep 2010 21:26:48 -0000 1.10
+++ rpm/rpmio/rpmjs.h 27 Sep 2014 15:51:24 -0000 1.10.2.1
@@ -123,7 +123,7 @@
* @param js js interpreter (NULL uses global interpreter)
* @param fn js file to run (NULL returns RPMRC_FAIL)
* @param Iargv js script argv
- * @param *resultp js exec result
+ * @param resultp *resultp js exec result
* @return RPMRC_OK on success
*/
rpmRC rpmjsRunFile(rpmjs js, /*@null@*/ const char * fn,
@@ -136,7 +136,7 @@
* Execute js string.
* @param js js interpreter (NULL uses global interpreter)
* @param str js string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp js exec result
+ * @param resultp *resultp js exec result
* @return RPMRC_OK on success
*/
rpmRC rpmjsRun(rpmjs js, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.c
============================================================================
$ cvs diff -u -r2.46.4.5 -r2.46.4.6 rpmlog.c
--- rpm/rpmio/rpmlog.c 25 Oct 2013 18:46:39 -0000 2.46.4.5
+++ rpm/rpmio/rpmlog.c 27 Sep 2014 15:51:24 -0000 2.46.4.6
@@ -121,12 +121,12 @@
return ocb;
}
-void rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
+int rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
/*@globals _rpmlogCallback, _rpmlogCallbackData @*/
{
*cb = _rpmlogCallback;
*data = _rpmlogCallbackData;
- return;
+ return 0;
}
/*@unchecked@*/ /*@null@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.h
============================================================================
$ cvs diff -u -r2.24.4.2 -r2.24.4.3 rpmlog.h
--- rpm/rpmio/rpmlog.h 24 Sep 2014 13:03:04 -0000 2.24.4.2
+++ rpm/rpmio/rpmlog.h 27 Sep 2014 15:51:24 -0000 2.24.4.3
@@ -196,7 +196,7 @@
*/
/*@observer@*/
const char * rpmlogLevelPrefix(rpmlogLvl pri)
- RPM_GNUC_PURE
+ RPM_GNUC_CONST
/*@*/;
/**
@@ -213,9 +213,9 @@
* Get rpmlog callback function and data.
* @param cb pointer to rpmlog callback function
* @param data pointer to callback private (user) data
- * @return none
+ * @return 0
*/
-void rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
+int rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
/*@globals internalState @*/
/*@modifies *cb, *data, internalState @*/;
@@ -268,6 +268,7 @@
*/
/*@unused@*/
void rpmlogOpen (const char * ident, int option, int facility)
+ RPM_GNUC_CONST
/*@globals internalState@*/
/*@modifies internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmacro.h
============================================================================
$ cvs diff -u -r2.56.4.7 -r2.56.4.8 rpmmacro.h
--- rpm/rpmio/rpmmacro.h 10 Sep 2014 20:13:18 -0000 2.56.4.7
+++ rpm/rpmio/rpmmacro.h 27 Sep 2014 15:51:24 -0000 2.56.4.8
@@ -150,6 +150,7 @@
/**
* Delete macro from context.
+ * @deprecated Use rpmUndefineMacro().
* @param mc macro context (NULL uses global context).
* @param n macro name
*/
@@ -162,7 +163,7 @@
* @param mc macro context (NULL uses global context).
* @param macro macro name, options, body
* @param level macro recursion level (0 is entry API)
- * @return @todo Document.
+ * @return 0 on success
*/
int rpmDefineMacro(/*@null@*/ MacroContext mc, const char * macro, int level)
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
@@ -172,7 +173,7 @@
* Undefine macro in context.
* @param mc macro context (NULL uses global context).
* @param macro macro name
- * @return @todo Document.
+ * @return 0 on success
*/
int rpmUndefineMacro(/*@null@*/ MacroContext mc, const char * macro)
/*@globals rpmGlobalMacroContext, internalState @*/
@@ -245,10 +246,7 @@
* @return macro expansion (malloc'ed)
*/
char * rpmExpand(/*@null@*/ const char * arg, ...)
-#if defined(__GNUC__) && __GNUC__ >= 4
- /* issue a warning if the list is not NULL-terminated */
- __attribute__((sentinel))
-#endif
+ RPM_GNUC_NULL_TERMINATED
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies rpmGlobalMacroContext, internalState @*/;
@@ -259,10 +257,7 @@
* @return macro expansion (malloc'ed)
*/
char * rpmMCExpand(/*@null@*/ MacroContext mc, /*@null@*/ const char * arg, ...)
-#if defined(__GNUC__) && __GNUC__ >= 4
- /* issue a warning if the list is not NULL-terminated */
- __attribute__((sentinel))
-#endif
+ RPM_GNUC_NULL_TERMINATED
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies rpmGlobalMacroContext, internalState @*/;
@@ -284,10 +279,7 @@
*/
/*@-redecl@*/ /* LCL: shrug */
char * rpmGetPath(/*@null@*/ const char * path, ...)
-#if defined(__GNUC__) && __GNUC__ >= 4
- /* issue a warning if the list is not NULL-terminated */
- __attribute__((sentinel))
-#endif
+ RPM_GNUC_NULL_TERMINATED
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies rpmGlobalMacroContext, internalState @*/;
/*@=redecl@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmrb.h
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmmrb.h
--- rpm/rpmio/rpmmrb.h 2 Aug 2014 17:40:05 -0000 1.1.2.1
+++ rpm/rpmio/rpmmrb.h 27 Sep 2014 15:51:24 -0000 1.1.2.2
@@ -134,7 +134,7 @@
* @param mrb The MRuby interpreter that is to be used
* (NULL uses global interpreter)
* @param str MRuby code to evaluate (NULL forces return of RPMRC_FAIL)
- * @param *resultp Result of the evaluation
+ * @param resultp *resultp Result of the evaluation
* @return RPMRC_OK on success
*/
rpmRC rpmmrbRun(rpmmrb mrb, /*@null@*/ const char *str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmperl.h
============================================================================
$ cvs diff -u -r2.9 -r2.9.2.1 rpmperl.h
--- rpm/rpmio/rpmperl.h 7 Apr 2010 03:20:06 -0000 2.9
+++ rpm/rpmio/rpmperl.h 27 Sep 2014 15:51:24 -0000 2.9.2.1
@@ -80,7 +80,7 @@
* Execute perl string.
* @param perl perl interpreter (NULL uses global interpreter)
* @param str perl string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp perl exec result
+ * @param resultp *resultp perl exec result
* @return RPMRC_OK on success
*/
rpmRC rpmperlRun(rpmperl perl, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.h
============================================================================
$ cvs diff -u -r2.108.2.14 -r2.108.2.15 rpmpgp.h
--- rpm/rpmio/rpmpgp.h 24 Sep 2014 13:03:04 -0000 2.108.2.14
+++ rpm/rpmio/rpmpgp.h 27 Sep 2014 15:51:24 -0000 2.108.2.15
@@ -1535,6 +1535,7 @@
*/
/*@exposed@*/
pgpDigParams pgpGetPubkey(const pgpDig dig)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmpgp
@@ -1544,6 +1545,7 @@
*/
/*@exposed@*/
pgpDigParams pgpGetSignature(const pgpDig dig)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmpgp
@@ -1605,6 +1607,7 @@
*/
/*@null@*/
void * pgpStatsAccumulator(pgpDig dig, int opx)
+ RPM_GNUC_CONST
/*@*/;
/** \ingroup rpmpgp
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.h
============================================================================
$ cvs diff -u -r2.10.2.1 -r2.10.2.2 rpmpython.h
--- rpm/rpmio/rpmpython.h 20 Jul 2014 00:13:40 -0000 2.10.2.1
+++ rpm/rpmio/rpmpython.h 27 Sep 2014 15:51:24 -0000 2.10.2.2
@@ -80,7 +80,7 @@
* Execute python from a file.
* @param python python interpreter (NULL uses global interpreter)
* @param fn python file to run (NULL returns RPMRC_FAIL)
- * @param *resultp python exec result
+ * @param resultp *resultp python exec result
* @return RPMRC_OK on success
*/
rpmRC rpmpythonRunFile(rpmpython python, /*@null@*/ const char * fn,
@@ -92,7 +92,7 @@
* Execute python string.
* @param python python interpreter (NULL uses global interpreter)
* @param str python string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp python exec result
+ * @param resultp *resultp python exec result
* @return RPMRC_OK on success
*/
rpmRC rpmpythonRun(rpmpython python, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.h
============================================================================
$ cvs diff -u -r2.10 -r2.10.2.1 rpmruby.h
--- rpm/rpmio/rpmruby.h 1 Dec 2010 16:05:19 -0000 2.10
+++ rpm/rpmio/rpmruby.h 27 Sep 2014 15:51:24 -0000 2.10.2.1
@@ -136,7 +136,7 @@
* @param ruby The Ruby interpreter that is to be used
* (NULL uses global interpreter)
* @param str Ruby code to evaluate (NULL forces return of RPMRC_FAIL)
- * @param *resultp Result of the evaluation
+ * @param resultp *resultp Result of the evaluation
* @return RPMRC_OK on success
*/
rpmRC rpmrubyRun(rpmruby ruby, /*@null@*/ const char *str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsq.h
============================================================================
$ cvs diff -u -r1.14.6.2 -r1.14.6.3 rpmsq.h
--- rpm/rpmio/rpmsq.h 3 Sep 2014 19:28:55 -0000 1.14.6.2
+++ rpm/rpmio/rpmsq.h 27 Sep 2014 15:51:24 -0000 1.14.6.3
@@ -160,6 +160,7 @@
* @return 0 if not equal
*/
int rpmsqThreadEqual(/*@null@*/ void * thread)
+ RPM_GNUC_CONST
/*@globals internalState @*/
/*@modifies internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.c
============================================================================
$ cvs diff -u -r2.59.2.12 -r2.59.2.13 rpmsql.c
--- rpm/rpmio/rpmsql.c 24 Sep 2014 13:03:04 -0000 2.59.2.12
+++ rpm/rpmio/rpmsql.c 27 Sep 2014 15:51:24 -0000 2.59.2.13
@@ -864,9 +864,7 @@
*/
/*@mayexit@*/ /*@printflike@*/
static void rpmsql_error(int lvl, const char *fmt, ...)
-#if defined(__GNUC__) && __GNUC__ >= 2
- __attribute__((format (printf, 2, 3)))
-#endif
+ RPM_GNUC_PRINTF(2, 3)
/*@globals fileSystem @*/
/*@modifies fileSystem @*/;
static void
@@ -991,9 +989,7 @@
*/
/*@printflike@*/
static int rpmsqlFprintf(rpmsql sql, const char *fmt, ...)
-#if defined(__GNUC__) && __GNUC__ >= 2
- __attribute__((format (printf, 2, 3)))
-#endif
+ RPM_GNUC_PRINTF(2, 3)
/*@*/;
static int rpmsqlFprintf(rpmsql sql, const char *fmt, ...)
{
@@ -1260,9 +1256,9 @@
/**
* constant function that returns the value of PI=3.1415...
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void piFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1274,9 +1270,9 @@
* Implements the sqrt function, it has the peculiarity of returning an integer when the
* the argument is an integer.
* Since SQLite isn't strongly typed (almost untyped actually) this is a bit pedantic
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void squareFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1304,9 +1300,9 @@
* Wraps the pow math.h function.
* When both the base and the exponent are integers the result should be integer
* (see sqrt just before this). Here the result is always double
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void powerFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1333,9 +1329,9 @@
/**
* atan2 wrapper.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void atn2Func(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1360,9 +1356,9 @@
* return one of 3 possibilities +1,0 or -1 when the argument is respectively
* positive, 0 or negative.
* When the argument is NULL the result is also NULL (completly conventional)
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void signFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1392,9 +1388,9 @@
/**
* smallest integer value not less than argument.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void ceilFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1420,9 +1416,9 @@
/**
* largest integer value not greater than argument.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void floorFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1449,9 +1445,9 @@
/**
* Given a string (s) in the first argument and an integer (n) in the second returns the
* string that constains s contatenated n times
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void replicateFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1524,9 +1520,9 @@
* until it has a length of n characters.
* When s has a length >= n it's a NOP
* padl(NULL) = NULL
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void padlFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1570,9 +1566,9 @@
* until it has a length of n characters.
* When s has a length >= n it's a NOP
* padl(NULL) = NULL
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void padrFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1620,9 +1616,9 @@
* Tries to add has many characters at the left as at the right.
* When s has a length >= n it's a NOP
* padl(NULL) = NULL
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void padcFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1672,9 +1668,9 @@
/**
* given 2 string (s1,s2) returns the string s1 with the characters NOT in s2 removed
* assumes strings are UTF-8 encoded
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void strfilterFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1719,15 +1715,15 @@
}
/**
- * Given a string z1, retutns the (0 based) index of it's first occurrence
+ * Given a string z1, returns the (0 based) index of it's first occurrence
* in z2 after the first s characters.
* Returns -1 when there isn't a match.
* updates p to point to the character where the match occurred.
* This is an auxiliary function.
- * @param z1
- * @param z2
- * @param s
- * @retval *p
+ * @param z1 z1 string
+ * @param z2 z2 string
+ * @param s s string
+ * @retval p *p where the match occurred
* @return index of 1st match (or -1)
*/
static int _substr(const char *z1, const char *z2, int s, const char **p)
@@ -1775,9 +1771,9 @@
* for the string s1. Returns the position where the match occurred.
* Characters are counted from 1.
* 0 is returned when no match occurs.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void charindexFunc(sqlite3_context * context,
@@ -1812,9 +1808,9 @@
/**
* given a string (s) and an integer (n) returns the n leftmost (UTF-8) characters
* if the string has a length <= n or is NULL this function is NOP
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void leftFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1851,9 +1847,9 @@
/**
* given a string (s) and an integer (n) returns the n rightmost (UTF-8) characters
* if the string has a length <= n or is NULL this function is NOP
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void rightFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1928,9 +1924,9 @@
/**
* Removes the whitespace at the beginning of a string
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void ltrimFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1948,9 +1944,9 @@
/**
* Removes the whitespace at the end of a string
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void rtrimFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1968,9 +1964,9 @@
/**
* Removes the whitespace at the beginning and end of a string
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void trimFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -1991,10 +1987,10 @@
* and it's length (l2) appends s2 to s1.
* All lengths in bytes.
* This is just an auxiliary function
- * @param s1
- * @param l1
- * @param s2
- * @param l2
+ * @param s1 s1 string
+ * @param l1 length of s1 string
+ * @param s2 s2 string
+ * @param l2 length of s2 string
*/
static void _append(char **s1, int l1, const char *s2, int l2)
{
@@ -2005,9 +2001,9 @@
/**
* given strings s, s1 and s2 replaces occurrences of s1 in s by s2
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void replaceFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -2073,9 +2069,9 @@
/**
* given a string returns the same string but with the characters in reverse order
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void reverseFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -2146,9 +2142,9 @@
/**
* called for each value received during a calculation of stdev or variance.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void varianceStep(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -2171,9 +2167,9 @@
/**
* called for each value received during a calculation of mode of median.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void modeStep(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -2302,7 +2298,7 @@
/**
* Returns the mode value.
- * @param context
+ * @param context sqlite3 context
*/
static void modeFinalize(sqlite3_context * context)
{
@@ -2323,7 +2319,7 @@
/**
* auxiliary function for percentiles.
- * @param context
+ * @param context sqlite3 context
*/
static void _medianFinalize(sqlite3_context * context)
{
@@ -2346,7 +2342,7 @@
/**
* Returns the median value.
- * @param context
+ * @param context sqlite3 context
*/
static void medianFinalize(sqlite3_context * context)
{
@@ -2359,7 +2355,7 @@
/**
* Returns the lower_quartile value.
- * @param context
+ * @param context sqlite3 context
*/
static void lower_quartileFinalize(sqlite3_context * context)
{
@@ -2372,7 +2368,7 @@
/**
* Returns the upper_quartile value.
- * @param context
+ * @param context sqlite3 context
*/
static void upper_quartileFinalize(sqlite3_context * context)
{
@@ -2385,7 +2381,7 @@
/**
* Returns the stdev value.
- * @param context
+ * @param context sqlite3 context
*/
static void stdevFinalize(sqlite3_context * context)
{
@@ -2398,7 +2394,7 @@
/**
* Returns the variance value.
- * @param context
+ * @param context sqlite3 context
*/
static void varianceFinalize(sqlite3_context * context)
{
@@ -2412,9 +2408,9 @@
/**
* Return a rpm macro expansion result.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void expandFunc(sqlite3_context * context,
int argc, sqlite3_value ** argv)
@@ -2425,9 +2421,9 @@
/**
* REGEXP for sqlite3 using miRE patterns.
- * @param context
- * @param argc
- * @param argv
+ * @param context sqlite3 context
+ * @param argc no. of arguments
+ * @param argv arguments array
*/
static void regexpFunc(sqlite3_context* context,
int argc, sqlite3_value** argv)
@@ -3000,7 +2996,7 @@
/**
* Compute a string length that is limited to what can be stored in
* lower 30 bits of a 32-bit signed integer.
- * @param z
+ * @param z z string
*/
RPM_GNUC_PURE
static int strlen30(const char *z)
@@ -3198,10 +3194,10 @@
* This is the callback routine that the shell
* invokes for each row of a query result.
* @param _sql sql interpreter
- * @param nArg
- * @param azArg
- * @param azCol
- * @param aiType
+ * @param nArg narg
+ * @param azArg azArg
+ * @param azCol azCol
+ * @param aiType aiType
*/
static int _rpmsqlShellCallback(void * _sql, int nArg, char **azArg, char **azCol,
int *aiType)
@@ -3388,9 +3384,9 @@
* This is the callback routine that the SQLite library
* invokes for each row of a query result.
* @param _sql sql interpreter
- * @param nArg
- * @param azArg
- * @param azCol
+ * @param nArg narg
+ * @param azArg azArg
+ * @param azCol azCol
*/
static int callback(void *_sql, int nArg, char **azArg, char **azCol)
{
@@ -3403,7 +3399,7 @@
* the name of the table given. Escape any quote characters in the
* table name.
* @param sql sql interpreter
- * @param zName
+ * @param zName table name
*/
static void set_table_name(rpmsql sql, const char *zName)
{
@@ -3450,7 +3446,7 @@
* @param zIn output string (or NULL)
* @param zAppend input string
* @param quote quote char (or NUL)
- * @return
+ * @return new zIn
*/
static char *appendText(char *zIn, char const *zAppend, char quote)
{
@@ -3498,9 +3494,9 @@
* This is used, for example, to show the schema of the database by
* querying the SQLITE_MASTER table.
* @param sql sql interpreter
- * @param db
- * @param zSelect
- * @param zFirstRow
+ * @param db sql database
+ * @param zSelect zSelect
+ * @param zFirstRow zFirstRow
*/
static int run_table_dump_query(rpmsql sql, sqlite3 * db,
const char *zSelect, const char *zFirstRow)
@@ -3688,7 +3684,7 @@
#if defined(WITH_SQLITE)
/**
* Allocate space and save off current error string.
- * @param db
+ * @param db sqlite3 database
*/
static char *save_err_msg(sqlite3 * db)
{
@@ -3706,9 +3702,9 @@
* function except it takes a slightly different callback
* and callback data argument.
* @param sql sql interpreter
- * @param zSql
- * @param xCallback
- * @retval *pzErrMsg
+ * @param zSql zSql
+ * @param xCallback xCallback
+ * @retval pzErrmsg *pzErrMsg
*/
static int _rpmsqlShellExec(rpmsql sql, const char *zSql,
int (*xCallback) (void *, int, char **, char **, int *),
@@ -3832,9 +3828,9 @@
* the table type ("index" or "table") and SQL to create the table.
* This routine should print text sufficient to recreate the table.
* @param _sql sql interpreter
- * @param nArg
- * @param azArg
- * @param azCol
+ * @param nArg narg
+ * @param azArg azArg
+ * @param azCol azCol
*/
static int dump_callback(void *_sql, int nArg, char **azArg, char **azCol)
{
@@ -3948,8 +3944,8 @@
* If we get a SQLITE_CORRUPT error, rerun the query after appending
* "ORDER BY rowid DESC" to the end.
* @param sql sql interpreter
- * @param zQuery
- * @retval *pzErrMsg
+ * @param zQuery zQuery
+ * @retval pzErrmsg *pzErrMsg
*/
static int run_schema_dump_query(rpmsql sql,
const char *zQuery, char **pzErrMsg)
@@ -4069,7 +4065,7 @@
/**
* Interpret zArg as a boolean value. Return either 0 or 1.
- * @param zArg
+ * @param zArg zArg
*/
static int booleanValue(const char * zArg)
{
@@ -4136,7 +4132,7 @@
* Process .foo SQLITE3 meta command.
*
* @param sql sql interpreter
- * @param zLine
+ * @param zLine zLine
* @return 0 on success, 1 on error, 2 to exit
*/
static int rpmsqlMetaCommand(rpmsql sql, char *zLine)
@@ -4929,7 +4925,7 @@
* of string z[].
* @param z input string
* @param N no. of chars to search
- * @return
+ * @return 1 if z[0:N] contains semicolon, 0 otherwise
*/
static int _contains_semicolon(const char *z, int N)
{
@@ -5009,8 +5005,8 @@
/**
* Return true if zSql is a complete SQL statement. Return false if it
* ends in the middle of a string literal or C-style comment.
- * @param zSql
- * @param nSql
+ * @param zSql zSql
+ * @param nSql nSql
* @return true if complete sql statement
*/
static int _is_complete(char *zSql, int nSql)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.h
============================================================================
$ cvs diff -u -r2.27.4.7 -r2.27.4.8 rpmsql.h
--- rpm/rpmio/rpmsql.h 17 Aug 2014 14:45:31 -0000 2.27.4.7
+++ rpm/rpmio/rpmsql.h 27 Sep 2014 15:51:24 -0000 2.27.4.8
@@ -270,7 +270,7 @@
/**
* Return arguments from a sql interpreter.
* @param sql sql interpreter
- * @retval *argcp no. of arguments
+ * @retval argcp *argcp no. of arguments
* @return sql interpreter args
*/
/*@null@*/
@@ -289,7 +289,7 @@
*
* @param sql sql interpreter (NULL uses global interpreter)
* @param str sql string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp sql interpreter result
+ * @param resultp *resultp sql interpreter result
* @return RPMRC_OK on success
*/
rpmRC rpmsqlRun(rpmsql sql, /*@null@*/ const char * str,
@@ -383,7 +383,7 @@
* @param pAux rpmsql object instance
* @param argc no. of arguments
* @param argv argument array
- * @retval *vtp virtual table
+ * @retval vtp *vtp virtual table
* @retval *pzErr error message
* @return 0 on success
*/
@@ -398,8 +398,8 @@
* @param pAux rpmsql object instance
* @param argc no. of arguments
* @param argv argument array
- * @retval *vtp virtual table
- * @retval *pzErr error message
+ * @retval vtp *vtp virtual table
+ * @retval pzErr *pzErr error message
* @return 0 on success
*/
int rpmvtConnect(void * _db, void * pAux,
@@ -435,9 +435,9 @@
/**
* Update a virtual table.
* @param vt virtual table
- * @param argc
- * @param _argv
- * @retval *pRowid (insert) new rowid
+ * @param argc no. of arguments
+ * @param _argv argument array
+ * @retval pRowid *pRowid (insert) new rowid
* @return 0 on success
*/
int rpmvtUpdate(rpmvt vt, int argc, rpmvArg * _argv, int64_t * pRowid)
@@ -557,10 +557,10 @@
/**
* Start a virtual table search.
* @param vc virtual cursor
- * @param idxNum
- * @param idxStr
- * @param argc
- * @param _argv
+ * @param idxNum index number
+ * @param idxStr index string
+ * @param argc no. of arguments
+ * @param _argv argument array
* @return 0 on success
*/
int rpmvcFilter(rpmvc vc, int idxNum, const char * idxStr,
@@ -586,7 +586,7 @@
/**
* Return a cursor column value.
* @param vc virtual cursor
- * @param _pContext
+ * @param _pContext (*_pContext) sqlite3 context
* @param colx column number
* @return 0 on success
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsquirrel.h
============================================================================
$ cvs diff -u -r2.6.2.1 -r2.6.2.2 rpmsquirrel.h
--- rpm/rpmio/rpmsquirrel.h 12 Jul 2013 21:40:49 -0000 2.6.2.1
+++ rpm/rpmio/rpmsquirrel.h 27 Sep 2014 15:51:24 -0000 2.6.2.2
@@ -81,7 +81,7 @@
* Execute squirrel from a file.
* @param squirrel squirrel interpreter (NULL uses global interpreter)
* @param fn squirrel file to run (NULL returns RPMRC_FAIL)
- * @param *resultp squirrel exec result
+ * @param resultp *resultp squirrel exec result
* @return RPMRC_OK on success
*/
rpmRC rpmsquirrelRunFile(rpmsquirrel squirrel, /*@null@*/ const char * fn,
@@ -93,7 +93,7 @@
* Execute squirrel string.
* @param squirrel squirrel interpreter (NULL uses global interpreter)
* @param str squirrel string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp squirrel exec result
+ * @param resultp *resultp squirrel exec result
* @return RPMRC_OK on success
*/
rpmRC rpmsquirrelRun(rpmsquirrel squirrel, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsvn.c
============================================================================
$ cvs diff -u -r2.1.2.4 -r2.1.2.5 rpmsvn.c
--- rpm/rpmio/rpmsvn.c 15 Apr 2012 21:20:53 -0000 2.1.2.4
+++ rpm/rpmio/rpmsvn.c 27 Sep 2014 15:51:24 -0000 2.1.2.5
@@ -10,10 +10,17 @@
#include <rpmurl.h>
#if defined(WITH_SUBVERSION)
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#endif
#include "svn_pools.h"
#include "svn_client.h"
#include "svn_repos.h"
#include "svn_subst.h"
+#if __clang__
+#pragma clang diagnostic pop
+#endif
#endif
#define _RPMSVN_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsw.c
============================================================================
$ cvs diff -u -r2.20 -r2.20.4.1 rpmsw.c
--- rpm/rpmio/rpmsw.c 29 May 2009 22:54:11 -0000 2.20
+++ rpm/rpmio/rpmsw.c 27 Sep 2014 15:51:24 -0000 2.20.4.1
@@ -103,8 +103,8 @@
/** \ingroup rpmio
* Return difference of 2 timeval stamps in micro-seconds.
- * @param *etv end timeval
- * @param *btv begin timeval
+ * @param etv *etv end timeval
+ * @param btv *btv begin timeval
* @return difference in milli-seconds
*/
static inline
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsw.h
============================================================================
$ cvs diff -u -r2.12.4.2 -r2.12.4.3 rpmsw.h
--- rpm/rpmio/rpmsw.h 24 Sep 2014 13:03:04 -0000 2.12.4.2
+++ rpm/rpmio/rpmsw.h 27 Sep 2014 15:51:24 -0000 2.12.4.3
@@ -76,7 +76,7 @@
#endif
/** Return benchmark time stamp.
- * @param *sw time stamp
+ * @param sw *sw time stamp
* @return 0 on success
*/
/*@-exportlocal@*/
@@ -87,8 +87,8 @@
/*@=exportlocal@*/
/** Return benchmark time stamp difference.
- * @param *end end time stamp
- * @param *begin begin time stamp
+ * @param end *end end time stamp
+ * @param begin *begin begin time stamp
* @return difference in micro-seconds
*/
/*@-exportlocal@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtcl.h
============================================================================
$ cvs diff -u -r2.13 -r2.13.2.1 rpmtcl.h
--- rpm/rpmio/rpmtcl.h 7 Apr 2010 03:20:07 -0000 2.13
+++ rpm/rpmio/rpmtcl.h 27 Sep 2014 15:51:24 -0000 2.13.2.1
@@ -82,7 +82,7 @@
* Execute tcl from a file.
* @param tcl tcl interpreter (NULL uses global interpreter)
* @param fn tcl file to run (NULL returns RPMRC_FAIL)
- * @param *resultp tcl exec result
+ * @param resultp *resultp tcl exec result
* @return RPMRC_OK on success
*/
rpmRC rpmtclRunFile(rpmtcl tcl, /*@null@*/ const char * fn,
@@ -94,7 +94,7 @@
* Execute tcl string.
* @param tcl tcl interpreter (NULL uses global interpreter)
* @param str tcl string to execute (NULL returns RPMRC_FAIL)
- * @param *resultp tcl exec result
+ * @param resultp *resultp tcl exec result
* @return RPMRC_OK on success
*/
rpmRC rpmtclRun(rpmtcl tcl, /*@null@*/ const char * str,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtpm.c
============================================================================
$ cvs diff -u -r1.5.2.19 -r1.5.2.20 rpmtpm.c
--- rpm/rpmio/rpmtpm.c 20 Jul 2014 00:14:14 -0000 1.5.2.19
+++ rpm/rpmio/rpmtpm.c 27 Sep 2014 15:51:24 -0000 1.5.2.20
@@ -58,7 +58,7 @@
{
FILE * fp = stdout;
size_t i;
- tpm = tpm;
+ (void)tpm;
if (msg)
fprintf(fp, "%s: ", msg);
if (b)
@@ -110,9 +110,9 @@
/**
* Process object OPTIONS and ARGS.
* @param tpm tpm object
- * @param ac
- * @param av
- * @param tbl
+ * @param ac arg count
+ * @param av arg array
+ * @param tbl POPT optionTable
*/
static void rpmtpmInitPopt(rpmtpm tpm, int ac, char ** av, poptOption tbl)
/*@modifies tpm @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmutil.h
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 rpmutil.h
--- /dev/null 2014-09-27 17:45:43.000000000 +0200
+++ rpmutil.h 2014-09-27 17:51:26.852798987 +0200
@@ -0,0 +1,118 @@
+#ifndef H_RPMUTIL
+#define H_RPMUTIL
+
+/**
+ * \file rpmio/rpmutil.h
+ * Compiler attributes for __GNUC__.
+ */
+
+/*
+ * Miscellaneous utility macros:
+ * - portability wrappers for various gcc extensions like __attribute__()
+ * - ...
+ *
+ * Copied from glib, names replaced to avoid clashing with glib.
+ *
+ */
+
+/* Here we provide RPM_GNUC_EXTENSION as an alias for __extension__,
+ * where this is valid. This allows for warningless compilation of
+ * "long long" types even in the presence of '-ansi -pedantic'.
+ */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+# define RPM_GNUC_EXTENSION __extension__
+#else
+# define RPM_GNUC_EXTENSION
+#endif
+
+/* Provide macros to feature the GCC function attribute.
+ */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+#define RPM_GNUC_PURE \
+ __attribute__((__pure__))
+#define RPM_GNUC_MALLOC \
+ __attribute__((__malloc__))
+#else
+#define RPM_GNUC_PURE
+#define RPM_GNUC_MALLOC
+#endif
+
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+#define RPM_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
+#define RPM_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
+#else
+#define RPM_GNUC_ALLOC_SIZE(x)
+#define RPM_GNUC_ALLOC_SIZE2(x,y)
+#endif
+
+#if __GNUC__ >= 4
+#define RPM_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define RPM_GNUC_NULL_TERMINATED
+#endif
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define RPM_GNUC_PRINTF( format_idx, arg_idx ) \
+ __attribute__((__format__ (__printf__, format_idx, arg_idx)))
+#define RPM_GNUC_SCANF( format_idx, arg_idx ) \
+ __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
+#define RPM_GNUC_FORMAT( arg_idx ) \
+ __attribute__((__format_arg__ (arg_idx)))
+#define RPM_GNUC_NORETURN \
+ __attribute__((__noreturn__))
+#define RPM_GNUC_CONST \
+ __attribute__((__const__))
+#define RPM_GNUC_UNUSED \
+ __attribute__((__unused__))
+#define RPM_GNUC_NO_INSTRUMENT \
+ __attribute__((__no_instrument_function__))
+#else /* !__GNUC__ */
+#define RPM_GNUC_PRINTF( format_idx, arg_idx )
+#define RPM_GNUC_SCANF( format_idx, arg_idx )
+#define RPM_GNUC_FORMAT( arg_idx )
+#define RPM_GNUC_NORETURN
+#define RPM_GNUC_CONST
+#define RPM_GNUC_UNUSED
+#define RPM_GNUC_NO_INSTRUMENT
+#endif /* !__GNUC__ */
+
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#define RPM_GNUC_DEPRECATED \
+ __attribute__((__deprecated__))
+#else
+#define RPM_GNUC_DEPRECATED
+#endif /* __GNUC__ */
+
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+#define RPM_GNUC_MAY_ALIAS __attribute__((may_alias))
+#define RPM_GNUC_NONNULL( ... ) \
+ __attribute__((__nonnull__ (__VA_ARGS__)))
+#else
+#define RPM_GNUC_MAY_ALIAS
+#define RPM_GNUC_NONNULL( ... )
+#endif
+
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#define RPM_GNUC_WARN_UNUSED_RESULT \
+ __attribute__((warn_unused_result))
+#else
+#define RPM_GNUC_WARN_UNUSED_RESULT
+#endif /* __GNUC__ */
+
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+# define RPM_GNUC_INTERNAL __attribute__((visibility("hidden")))
+#else
+# define RPM_GNUC_INTERNAL
+#endif
+
+
+/* Guard C code in headers, while including them from C++ */
+#ifdef __cplusplus
+# define RPM_BEGIN_DECLS extern "C" {
+# define RPM_END_DECLS }
+#else
+# define RPM_BEGIN_DECLS
+# define RPM_END_DECLS
+#endif
+
+#endif /* H_RPMUTIL */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmxar.h
============================================================================
$ cvs diff -u -r2.15 -r2.15.4.1 rpmxar.h
--- rpm/rpmio/rpmxar.h 9 Jul 2009 01:26:09 -0000 2.15
+++ rpm/rpmio/rpmxar.h 27 Sep 2014 15:51:25 -0000 2.15.4.1
@@ -106,6 +106,7 @@
/*@modifies xar, fileSystem @*/;
int rpmxarPull(rpmxar xar, /*@null@*/ const char * fn)
+ RPM_GNUC_CONST
/*@globals fileSystem @*/
/*@modifies xar, fileSystem @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa10.h
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 salsa10.h
--- rpm/rpmio/salsa10.h 24 Jun 2007 10:27:21 -0000 1.3
+++ rpm/rpmio/salsa10.h 27 Sep 2014 15:51:25 -0000 1.3.10.1
@@ -71,8 +71,8 @@
* \brief This function should be used to pass successive blocks of data
* to be hashed.
* \param mp The hash function's parameter block.
- * \param data
- * \param size
+ * \param data octets
+ * \param size no. of octets
* \retval 0 on success.
*/
BEECRYPTAPI
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/salsa20.h
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 salsa20.h
--- rpm/rpmio/salsa20.h 24 Jun 2007 10:27:21 -0000 1.3
+++ rpm/rpmio/salsa20.h 27 Sep 2014 15:51:25 -0000 1.3.10.1
@@ -71,8 +71,8 @@
* \brief This function should be used to pass successive blocks of data
* to be hashed.
* \param mp The hash function's parameter block.
- * \param data
- * \param size
+ * \param data octets
+ * \param size no. of octets
* \retval 0 on success.
*/
BEECRYPTAPI
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tar.h
============================================================================
$ cvs diff -u -r1.4.8.1 -r1.4.8.2 tar.h
--- rpm/rpmio/tar.h 4 Jun 2012 15:10:22 -0000 1.4.8.1
+++ rpm/rpmio/tar.h 27 Sep 2014 15:51:25 -0000 1.4.8.2
@@ -54,7 +54,7 @@
/**
* Read tar header from payload.
* @retval _iosm file path and stat info
- * @retval st
+ * @retval st stat(2) buffer
* @return 0 on success
*/
int tarHeaderRead(void * _iosm, struct stat * st)
@@ -64,7 +64,7 @@
/**
* Write tar header to payload.
* @retval _iosm file path and stat info
- * @param st
+ * @param st stat(2) buffer
* @return 0 on success
*/
int tarHeaderWrite(void * _iosm, struct stat * st)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tiger.h
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 tiger.h
--- rpm/rpmio/tiger.h 24 Jun 2007 10:27:21 -0000 1.3
+++ rpm/rpmio/tiger.h 27 Sep 2014 15:51:25 -0000 1.3.10.1
@@ -71,8 +71,8 @@
* \brief This function should be used to pass successive blocks of data
* to be hashed.
* \param mp The hash function's parameter block.
- * \param data
- * \param size
+ * \param data octets
+ * \param size no. of octets
* \retval 0 on success.
*/
BEECRYPTAPI
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ttpm.c
============================================================================
$ cvs diff -u -r2.6.2.3 -r2.6.2.4 ttpm.c
--- rpm/rpmio/ttpm.c 26 Sep 2013 17:01:54 -0000 2.6.2.3
+++ rpm/rpmio/ttpm.c 27 Sep 2014 15:51:25 -0000 2.6.2.4
@@ -1062,6 +1062,7 @@
return handled;
}
+RPM_GNUC_CONST
static unsigned int
countOnes(unsigned char l)
{
@@ -1075,6 +1076,7 @@
return c;
}
+RPM_GNUC_CONST
static unsigned int
matchPattern(unsigned char l, unsigned char pattern, unsigned char bits)
{
@@ .
______________________________________________________________________
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