RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 04-Oct-2007 09:20:44
Branch: HEAD Handle: 2007100408204202
Modified files:
rpm CHANGES
rpm/lib package.c
rpm/rpmconstant constant.c
rpm/rpmdb db3.c header_internal.c header_internal.h
rpm/rpmio rpmrpc.c
rpm/tools rpmcmp.c
Log:
remove all compile-time warnings caused by recent changes
Summary:
Revision Changes Path
1.1653 +1 -0 rpm/CHANGES
2.165 +0 -1 rpm/lib/package.c
1.6 +2 -2 rpm/rpmconstant/constant.c
1.74 +1 -1 rpm/rpmdb/db3.c
1.9 +23 -0 rpm/rpmdb/header_internal.c
1.19 +2 -24 rpm/rpmdb/header_internal.h
2.56 +3 -2 rpm/rpmio/rpmrpc.c
2.3 +1 -1 rpm/tools/rpmcmp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1652 -r1.1653 CHANGES
--- rpm/CHANGES 2 Oct 2007 22:32:48 -0000 1.1652
+++ rpm/CHANGES 4 Oct 2007 07:20:42 -0000 1.1653
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: remove all compile-time warnings caused by recent changes
- jbj: fix: add, not delete, the just read signature data.
- jbj: update sv.po (Translation Project).
- jbj: insure rpmlib -> rpmdb forward linkage only.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.164 -r2.165 package.c
--- rpm/lib/package.c 2 Oct 2007 22:32:48 -0000 2.164
+++ rpm/lib/package.c 4 Oct 2007 07:20:43 -0000 2.165
@@ -85,7 +85,6 @@
rpmRC rpmReadHeader(rpmts ts, void * _fd, Header *hdrp, const char ** msg)
{
- pgpDig dig = rpmtsDig(ts);
FD_t fd = _fd;
char buf[BUFSIZ];
int_32 block[4];
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/constant.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 constant.c
--- rpm/rpmconstant/constant.c 18 Sep 2007 06:47:54 -0000 1.5
+++ rpm/rpmconstant/constant.c 4 Oct 2007 07:20:43 -0000 1.6
@@ -1,5 +1,5 @@
/* Nanar <nanardon@zarb.org>
- * $Id: constant.c,v 1.5 2007/09/18 06:47:54 rse Exp $
+ * $Id: constant.c,v 1.6 2007/10/04 07:20:43 rse Exp $
*/
#include "system.h"
@@ -33,7 +33,7 @@
POPT_TABLEEND
};
- optcon = poptGetContext(NULL, argc, argv, optionstable, 0);
+ optcon = poptGetContext(NULL, argc, (const char **)argv, optionstable, 0);
while ((c = poptGetNextOpt(optcon)) >= 0) {}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.73 -r1.74 db3.c
--- rpm/rpmdb/db3.c 30 Sep 2007 17:29:05 -0000 1.73
+++ rpm/rpmdb/db3.c 4 Oct 2007 07:20:43 -0000 1.74
@@ -285,7 +285,7 @@
if (!oneshot) {
#if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR != 0) || (DB_VERSION_MAJOR == 4)
- xx = db_env_set_func_open(Open);
+ xx = db_env_set_func_open((int (*)(const char *, int, ...))Open);
xx = cvtdberr(dbi, "db_env_set_func_open", xx, _debug);
#endif
oneshot++;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header_internal.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 header_internal.c
--- rpm/rpmdb/header_internal.c 30 Sep 2007 17:29:05 -0000 1.8
+++ rpm/rpmdb/header_internal.c 4 Oct 2007 07:20:43 -0000 1.9
@@ -9,6 +9,29 @@
#include "debug.h"
+/**
+ * Alignment needs (and sizeof scalars types) for internal rpm data types.
+ */
+/*@observer@*/ /*@unchecked@*/
+int rpm_typeAlign[16] = {
+ 1, /*!< RPM_NULL_TYPE */
+ 1, /*!< RPM_CHAR_TYPE */
+ 1, /*!< RPM_INT8_TYPE */
+ 2, /*!< RPM_INT16_TYPE */
+ 4, /*!< RPM_INT32_TYPE */
+ 8, /*!< RPM_INT64_TYPE */
+ 1, /*!< RPM_STRING_TYPE */
+ 1, /*!< RPM_BIN_TYPE */
+ 1, /*!< RPM_STRING_ARRAY_TYPE */
+ 1, /*!< RPM_I18NSTRING_TYPE */
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+};
+
int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate)
{
/*@-castexpose@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header_internal.h
============================================================================
$ cvs diff -u -r1.18 -r1.19 header_internal.h
--- rpm/rpmdb/header_internal.h 8 Sep 2007 18:55:46 -0000 1.18
+++ rpm/rpmdb/header_internal.h 4 Oct 2007 07:20:43 -0000 1.19
@@ -12,29 +12,6 @@
#endif /* __LCLINT__ */
/**
- * Alignment needs (and sizeof scalars types) for internal rpm data types.
- */
-/*@observer@*/ /*@unchecked@*/
-static int typeAlign[16] = {
- 1, /*!< RPM_NULL_TYPE */
- 1, /*!< RPM_CHAR_TYPE */
- 1, /*!< RPM_INT8_TYPE */
- 2, /*!< RPM_INT16_TYPE */
- 4, /*!< RPM_INT32_TYPE */
- 8, /*!< RPM_INT64_TYPE */
- 1, /*!< RPM_STRING_TYPE */
- 1, /*!< RPM_BIN_TYPE */
- 1, /*!< RPM_STRING_ARRAY_TYPE */
- 1, /*!< RPM_I18NSTRING_TYPE */
- 0,
- 0,
- 0,
- 0,
- 0,
- 0
-};
-
-/**
* Sanity check on no. of tags.
* This check imposes a limit of 65K tags, more than enough.
*/
@@ -54,7 +31,8 @@
/**
* Sanity check on data alignment for data type.
*/
-#define hdrchkAlign(_type, _off) ((_off) & (typeAlign[_type]-1))
+extern int rpm_typeAlign[16];
+#define hdrchkAlign(_type, _off) ((_off) & (rpm_typeAlign[_type]-1))
/**
* Sanity check on range of data offset.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
============================================================================
$ cvs diff -u -r2.55 -r2.56 rpmrpc.c
--- rpm/rpmio/rpmrpc.c 24 Sep 2007 02:38:57 -0000 2.55
+++ rpm/rpmio/rpmrpc.c 4 Oct 2007 07:20:43 -0000 2.56
@@ -8,10 +8,11 @@
#include <pthread.h>
#endif
-#include <rpmio_internal.h>
+#include "rpmio_internal.h"
+#include "rpmmacro.h"
#define _RPMDAV_INTERNAL
-#include <rpmdav.h>
+#include "rpmdav.h"
#include "ugid.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmcmp.c
============================================================================
$ cvs diff -u -r2.2 -r2.3 rpmcmp.c
--- rpm/tools/rpmcmp.c 18 Sep 2007 06:47:55 -0000 2.2
+++ rpm/tools/rpmcmp.c 4 Oct 2007 07:20:44 -0000 2.3
@@ -56,7 +56,7 @@
else
progname = argv[0];
- optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+ optCon = poptGetContext(argv[0], argc, (const char **)argv, optionsTable, 0);
while ((rc = poptGetNextOpt(optCon)) > 0)
;
@@ .
Received on Thu Oct 4 09:20:44 2007