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: 19-Nov-2007 19:58:01
Branch: HEAD Handle: 2007111918575406
Added files:
rpm/rpmio rpmcb.h
Modified files:
rpm CHANGES Doxyfile.in
rpm/lib formats.c fs.c fsm.c manifest.c misc.c package.c
psm.c rpmal.c rpmcli.h rpmds.c rpmds.h rpmfc.c
rpmfi.c rpmgi.c rpmlib.h rpmlock.c rpmps.c rpmrc.c
rpmte.c rpmts.c transaction.c
rpm/perl RPM_Dependencies.xs
rpm/python rpmal-py.c rpmdb-py.c rpmds-py.c rpmfd-py.c
rpmfi-py.c rpmmi-py.c rpmps-py.c rpmte-py.c
rpm/rpmconstant rpmconstant.h
rpm/rpmdb db3.c dbconfig.c pkgio.c poptDB.c rpmdb.c
signature.c sqlite.c
rpm/rpmio Makefile.am macro.c rpmio.c rpmio.h url.c
rpm/tools rpmcmp.c
Removed files:
rpm/rpmio rpmmessages.h
Log:
- add "struct utimbuf" and "struct utsname" to eliminate perl wanings.
- adjust includes throughout.
- move popt.h from rpmlib.h to rpmcli.h, most routines don't need.
- don't include rpmcb.h from rpmlib.h, explcit includes instead.
- update Doxyfile.
- rename rpmmessages.h -> rpmcb.h consistent with callback content.
Summary:
Revision Changes Path
1.1849 +6 -0 rpm/CHANGES
2.81 +1 -2 rpm/Doxyfile.in
2.119 +3 -2 rpm/lib/formats.c
2.61 +1 -1 rpm/lib/fs.c
2.135 +2 -1 rpm/lib/fsm.c
2.22 +2 -1 rpm/lib/manifest.c
2.148 +1 -0 rpm/lib/misc.c
2.184 +1 -0 rpm/lib/package.c
2.262 +2 -1 rpm/lib/psm.c
2.63 +2 -1 rpm/lib/rpmal.c
2.74 +5 -3 rpm/lib/rpmcli.h
2.81 +2 -1 rpm/lib/rpmds.c
2.63 +1 -0 rpm/lib/rpmds.h
1.38 +1 -0 rpm/lib/rpmfc.c
2.100 +1 -0 rpm/lib/rpmfi.c
2.40 +3 -2 rpm/lib/rpmgi.c
2.448 +0 -2 rpm/lib/rpmlib.h
2.17 +2 -1 rpm/lib/rpmlock.c
2.18 +2 -1 rpm/lib/rpmps.c
2.217 +2 -2 rpm/lib/rpmrc.c
2.68 +3 -1 rpm/lib/rpmte.c
2.121 +2 -1 rpm/lib/rpmts.c
1.353 +2 -3 rpm/lib/transaction.c
1.6 +2 -0 rpm/perl/RPM_Dependencies.xs
1.14 +1 -0 rpm/python/rpmal-py.c
1.18 +1 -0 rpm/python/rpmdb-py.c
1.36 +1 -0 rpm/python/rpmds-py.c
1.21 +1 -0 rpm/python/rpmfd-py.c
1.23 +1 -0 rpm/python/rpmfi-py.c
1.20 +2 -1 rpm/python/rpmmi-py.c
1.12 +1 -0 rpm/python/rpmps-py.c
1.22 +1 -0 rpm/python/rpmte-py.c
1.4 +2 -1 rpm/rpmconstant/rpmconstant.h
1.81 +2 -1 rpm/rpmdb/db3.c
1.50 +2 -0 rpm/rpmdb/dbconfig.c
1.39 +4 -3 rpm/rpmdb/pkgio.c
1.9 +2 -0 rpm/rpmdb/poptDB.c
1.213 +1 -0 rpm/rpmdb/rpmdb.c
1.29 +1 -0 rpm/rpmdb/signature.c
1.24 +2 -1 rpm/rpmdb/sqlite.c
1.109 +2 -2 rpm/rpmio/Makefile.am
2.154 +8 -4 rpm/rpmio/macro.c
2.1 +82 -0 rpm/rpmio/rpmcb.h
1.104 +1 -1 rpm/rpmio/rpmio.c
1.62 +1 -0 rpm/rpmio/rpmio.h
2.19 +0 -80 rpm/rpmio/rpmmessages.h
1.44 +1 -1 rpm/rpmio/url.c
2.4 +2 -0 rpm/tools/rpmcmp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1848 -r1.1849 CHANGES
--- rpm/CHANGES 19 Nov 2007 17:07:46 -0000 1.1848
+++ rpm/CHANGES 19 Nov 2007 18:57:54 -0000 1.1849
@@ -1,4 +1,10 @@
5.0a2 -> 5.0a3:
+ - jbj: add "struct utimbuf" and "struct utsname" to eliminate perl wanings.
+ - jbj: adjust includes throughout.
+ - jbj: move popt.h from rpmlib.h to rpmcli.h, most routines don't need.
+ - jbj: don't include rpmcb.h from rpmlib.h, explcit includes instead.
+ - jbj: update Doxyfile.
+ - jbj: rename rpmmessages.h -> rpmcb.h consistent with callback content.
- jbj: doScript: use pid_t, not int.
- jbj: eliminate rpmerr.h, use rpmlog.h instead.
- jbj: eliminate rpmMessage and RPMMESS_FOO constants, use rpmlog instead.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Doxyfile.in
============================================================================
$ cvs diff -u -r2.80 -r2.81 Doxyfile.in
--- rpm/Doxyfile.in 9 Nov 2007 23:34:40 -0000 2.80
+++ rpm/Doxyfile.in 19 Nov 2007 18:57:54 -0000 2.81
@@ -636,9 +636,9 @@
@top_srcdir@/rpmio/getpass.c \
@top_srcdir@/rpmio/lookup3.c \
@top_srcdir@/rpmio/macro.c \
+ @top_srcdir@/rpmio/rpmcb.h \
@top_srcdir@/rpmio/rpmlog.c \
@top_srcdir@/rpmio/rpmlog.h \
- @top_srcdir@/rpmio/rpmerr.h \
@top_srcdir@/rpmio/rpmhash.c \
@top_srcdir@/rpmio/rpmhash.h \
@top_srcdir@/rpmio/rpmio.c \
@@ -646,7 +646,6 @@
@top_srcdir@/rpmio/rpmio_internal.h \
@top_srcdir@/rpmio/rpmmacro.h \
@top_srcdir@/rpmio/rpmmalloc.c \
- @top_srcdir@/rpmio/rpmmessages.h \
@top_srcdir@/rpmio/rpmmg.c \
@top_srcdir@/rpmio/rpmmg.h \
@top_srcdir@/rpmio/rpmpgp.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/formats.c
============================================================================
$ cvs diff -u -r2.118 -r2.119 formats.c
--- rpm/lib/formats.c 12 Nov 2007 13:07:56 -0000 2.118
+++ rpm/lib/formats.c 19 Nov 2007 18:57:54 -0000 2.119
@@ -4,9 +4,10 @@
#include "system.h"
-#include "rpmio_internal.h"
+#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
+#include <rpmmacro.h> /* XXX for %_i18ndomains */
#include <rpmlib.h>
-#include <rpmmacro.h> /* XXX for %_i18ndomains */
#define _RPMEVR_INTERNAL
#include <rpmds.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fs.c
============================================================================
$ cvs diff -u -r2.60 -r2.61 fs.c
--- rpm/lib/fs.c 12 Nov 2007 12:30:46 -0000 2.60
+++ rpm/lib/fs.c 19 Nov 2007 18:57:54 -0000 2.61
@@ -3,8 +3,8 @@
*/
#include "system.h"
-#include <rpmlib.h>
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmmacro.h> /* XXX for rpmGetPath */
#include "fs.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.134 -r2.135 fsm.c
--- rpm/lib/fsm.c 19 Nov 2007 17:07:47 -0000 2.134
+++ rpm/lib/fsm.c 19 Nov 2007 18:57:54 -0000 2.135
@@ -5,7 +5,8 @@
#include "system.h"
-#include <rpmio_internal.h>
+#include <rpmio_internal.h> /* XXX urlPath, fdGetCpioPos */
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "cpio.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/manifest.c
============================================================================
$ cvs diff -u -r2.21 -r2.22 manifest.c
--- rpm/lib/manifest.c 9 Nov 2007 21:32:37 -0000 2.21
+++ rpm/lib/manifest.c 19 Nov 2007 18:57:54 -0000 2.22
@@ -4,7 +4,8 @@
#include "system.h"
-#include <rpmio_internal.h>
+#include <rpmio_internal.h> /* XXX fdGetFp */
+#include <rpmlog.h>
#include <rpmlib.h>
#include <rpmmacro.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/misc.c
============================================================================
$ cvs diff -u -r2.147 -r2.148 misc.c
--- rpm/lib/misc.c 9 Nov 2007 23:18:02 -0000 2.147
+++ rpm/lib/misc.c 19 Nov 2007 18:57:54 -0000 2.148
@@ -8,6 +8,7 @@
const char * RPMVERSION = VERSION;
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmurl.h>
#include <rpmmacro.h> /* XXX for rpmGetPath */
#include <rpmlib.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.183 -r2.184 package.c
--- rpm/lib/package.c 17 Nov 2007 17:57:38 -0000 2.183
+++ rpm/lib/package.c 19 Nov 2007 18:57:54 -0000 2.184
@@ -7,6 +7,7 @@
#include <netinet/in.h>
#include <rpmio_internal.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "rpmts.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.261 -r2.262 psm.c
--- rpm/lib/psm.c 15 Nov 2007 20:26:04 -0000 2.261
+++ rpm/lib/psm.c 19 Nov 2007 18:57:54 -0000 2.262
@@ -6,10 +6,11 @@
#include "system.h"
#include <rpmio_internal.h>
-#include <rpmlib.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmmacro.h>
#include <rpmurl.h>
#include <rpmlua.h>
+#include <rpmlib.h>
#include "cpio.h"
#include "fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmal.c
============================================================================
$ cvs diff -u -r2.62 -r2.63 rpmal.c
--- rpm/lib/rpmal.c 12 Nov 2007 13:42:20 -0000 2.62
+++ rpm/lib/rpmal.c 19 Nov 2007 18:57:54 -0000 2.63
@@ -4,8 +4,9 @@
#include "system.h"
-#include <rpmlib.h>
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
+#include <rpmlib.h>
#include "rpmal.h"
#define _RPMDS_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmcli.h
============================================================================
$ cvs diff -u -r2.73 -r2.74 rpmcli.h
--- rpm/lib/rpmcli.h 12 Nov 2007 12:30:46 -0000 2.73
+++ rpm/lib/rpmcli.h 19 Nov 2007 18:57:54 -0000 2.74
@@ -5,11 +5,13 @@
* \file lib/rpmcli.h
*/
-#include "rpmlib.h"
-#include "rpmurl.h"
+#include "popt.h"
+#include "argv.h"
+#include "rpmcb.h"
#include "rpmmacro.h"
+#include "rpmurl.h"
+#include "rpmlib.h"
#include "rpmps.h"
-#include "argv.h"
/** \ingroup rpmcli
* Should version 3 packages be produced?
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.80 -r2.81 rpmds.c
--- rpm/lib/rpmds.c 10 Nov 2007 18:06:42 -0000 2.80
+++ rpm/lib/rpmds.c 19 Nov 2007 18:57:54 -0000 2.81
@@ -76,8 +76,9 @@
#endif
#include <rpmio_internal.h> /* XXX fdGetFILE */
-#include <rpmlib.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmmacro.h>
+#include <rpmlib.h>
#define _RPMDS_INTERNAL
#define _RPMEVR_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.h
============================================================================
$ cvs diff -u -r2.62 -r2.63 rpmds.h
--- rpm/lib/rpmds.h 9 Nov 2007 21:59:44 -0000 2.62
+++ rpm/lib/rpmds.h 19 Nov 2007 18:57:54 -0000 2.63
@@ -609,6 +609,7 @@
* @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 @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.37 -r1.38 rpmfc.c
--- rpm/lib/rpmfc.c 19 Nov 2007 17:07:47 -0000 1.37
+++ rpm/lib/rpmfc.c 19 Nov 2007 18:57:54 -0000 1.38
@@ -3,6 +3,7 @@
#include <signal.h> /* getOutputFrom() */
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#define _RPMEVR_INTERNAL
#include <rpmbuild.h>
#include <argv.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.99 -r2.100 rpmfi.c
--- rpm/lib/rpmfi.c 10 Nov 2007 18:06:42 -0000 2.99
+++ rpm/lib/rpmfi.c 19 Nov 2007 18:57:54 -0000 2.100
@@ -6,6 +6,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmurl.h> /* XXX urlGetPath */
#include <rpmlib.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.39 -r2.40 rpmgi.c
--- rpm/lib/rpmgi.c 13 Nov 2007 01:36:50 -0000 2.39
+++ rpm/lib/rpmgi.c 19 Nov 2007 18:57:54 -0000 2.40
@@ -4,8 +4,10 @@
*/
#include "system.h"
-#include <rpmlib.h>
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
+#include <rpmmacro.h> /* XXX rpmExpand */
+#include <rpmlib.h>
#include <rpmte.h> /* XXX rpmElementType */
#include <pkgio.h> /* XXX rpmElementType */
@@ -14,7 +16,6 @@
#include <rpmgi.h>
#include <rpmdb.h>
-#include <rpmmacro.h> /* XXX rpmExpand */
#include "manifest.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.447 -r2.448 rpmlib.h
--- rpm/lib/rpmlib.h 19 Nov 2007 17:07:47 -0000 2.447
+++ rpm/lib/rpmlib.h 19 Nov 2007 18:57:54 -0000 2.448
@@ -8,9 +8,7 @@
*
*/
-#include "rpmmessages.h"
#include <rpmtag.h>
-#include "popt.h"
#define RPM_FORMAT_VERSION 5
#define RPM_MAJOR_VERSION 0
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlock.c
============================================================================
$ cvs diff -u -r2.16 -r2.17 rpmlock.c
--- rpm/lib/rpmlock.c 11 Oct 2007 19:44:22 -0000 2.16
+++ rpm/lib/rpmlock.c 19 Nov 2007 18:57:54 -0000 2.17
@@ -1,8 +1,9 @@
#include "system.h"
-#include <rpmlib.h>
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmmacro.h>
+#include <rpmlib.h>
#include "rpmts.h"
#include "rpmlock.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmps.c
============================================================================
$ cvs diff -u -r2.17 -r2.18 rpmps.c
--- rpm/lib/rpmps.c 15 Nov 2007 20:26:04 -0000 2.17
+++ rpm/lib/rpmps.c 19 Nov 2007 18:57:54 -0000 2.18
@@ -4,8 +4,9 @@
#include "system.h"
-#include <rpmlib.h>
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
+#include <rpmlib.h>
#define _RPMPS_INTERNAL
#include "rpmps.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.216 -r2.217 rpmrc.c
--- rpm/lib/rpmrc.c 9 Nov 2007 21:32:37 -0000 2.216
+++ rpm/lib/rpmrc.c 19 Nov 2007 18:57:54 -0000 2.217
@@ -10,9 +10,9 @@
#define _MIRE_INTERNAL
#include <rpmio_internal.h> /* for rpmioSlurp() */
-#include <rpmcli.h>
-#include <rpmmacro.h>
#include <rpmlua.h>
+#include <rpmmacro.h>
+#include <rpmcli.h>
#include <rpmds.h>
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.67 -r2.68 rpmte.c
--- rpm/lib/rpmte.c 15 Nov 2007 20:26:04 -0000 2.67
+++ rpm/lib/rpmte.c 19 Nov 2007 18:57:54 -0000 2.68
@@ -3,8 +3,10 @@
* Routine(s) to handle an "rpmte" transaction element.
*/
#include "system.h"
-#include <rpmlib.h>
+
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
+#include <rpmlib.h>
#include "rpmds.h"
#include "rpmfi.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.120 -r2.121 rpmts.c
--- rpm/lib/rpmts.c 15 Nov 2007 20:26:04 -0000 2.120
+++ rpm/lib/rpmts.c 19 Nov 2007 18:57:54 -0000 2.121
@@ -5,8 +5,9 @@
#include "system.h"
#include "rpmio_internal.h" /* XXX for pgp and beecrypt */
-#include <rpmlib.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmmacro.h> /* XXX rpmtsOpenDB() needs rpmGetPath */
+#include <rpmlib.h>
#define _RPMDB_INTERNAL /* XXX almost opaque sigh */
#include "rpmdb.h" /* XXX stealing db->db_mode. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.352 -r1.353 transaction.c
--- rpm/lib/transaction.c 10 Nov 2007 18:06:42 -0000 1.352
+++ rpm/lib/transaction.c 19 Nov 2007 18:57:54 -0000 1.353
@@ -5,11 +5,10 @@
#include "system.h"
#include <rpmio.h>
-#include "rpmcli.h" /* IDTX prototypes */
-#include <rpmlib.h>
-
#include <rpmmacro.h> /* XXX for rpmExpand */
+#include "rpmcli.h" /* IDTX prototypes */
+
#include "fsm.h"
#define _RPMSQ_INTERNAL
#include "psm.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/perl/RPM_Dependencies.xs
============================================================================
$ cvs diff -u -r1.5 -r1.6 RPM_Dependencies.xs
--- rpm/perl/RPM_Dependencies.xs 8 Aug 2007 23:35:14 -0000 1.5
+++ rpm/perl/RPM_Dependencies.xs 19 Nov 2007 18:57:58 -0000 1.6
@@ -6,6 +6,8 @@
#undef Mkdir
#undef Stat
+#include "rpmcb.h" /* XXX fnpyKey */
+
#define _RPMEVR_INTERNAL
#include "rpmlib.h"
#include "rpmds.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmal-py.c
============================================================================
$ cvs diff -u -r1.13 -r1.14 rpmal-py.c
--- rpm/python/rpmal-py.c 17 Nov 2004 17:05:39 -0000 1.13
+++ rpm/python/rpmal-py.c 19 Nov 2007 18:57:58 -0000 1.14
@@ -4,6 +4,7 @@
#include "system.h"
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "rpmal-py.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmdb-py.c
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpmdb-py.c
--- rpm/python/rpmdb-py.c 20 Jul 2007 22:47:34 -0000 1.17
+++ rpm/python/rpmdb-py.c 19 Nov 2007 18:57:58 -0000 1.18
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "rpmdb-py.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmds-py.c
============================================================================
$ cvs diff -u -r1.35 -r1.36 rpmds-py.c
--- rpm/python/rpmds-py.c 2 Aug 2007 12:45:43 -0000 1.35
+++ rpm/python/rpmds-py.c 19 Nov 2007 18:57:58 -0000 1.36
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "header-py.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmfd-py.c
============================================================================
$ cvs diff -u -r1.20 -r1.21 rpmfd-py.c
--- rpm/python/rpmfd-py.c 15 Jul 2007 16:32:17 -0000 1.20
+++ rpm/python/rpmfd-py.c 19 Nov 2007 18:57:58 -0000 1.21
@@ -7,6 +7,7 @@
#include <glob.h> /* XXX rpmio.h */
#include <dirent.h> /* XXX rpmio.h */
#include <rpmio_internal.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h> /* XXX _free */
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmfi-py.c
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpmfi-py.c
--- rpm/python/rpmfi-py.c 20 Jul 2007 22:47:34 -0000 1.22
+++ rpm/python/rpmfi-py.c 19 Nov 2007 18:57:58 -0000 1.23
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "header-py.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmmi-py.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpmmi-py.c
--- rpm/python/rpmmi-py.c 20 Jul 2007 22:47:34 -0000 1.19
+++ rpm/python/rpmmi-py.c 19 Nov 2007 18:57:58 -0000 1.20
@@ -5,8 +5,9 @@
#include "system.h"
#include <rpmio.h>
-#include <rpmlib.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmdb.h>
+#include <rpmlib.h>
#include "rpmmi-py.h"
#include "header-py.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmps-py.c
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpmps-py.c
--- rpm/python/rpmps-py.c 22 Oct 2007 07:02:43 -0000 1.11
+++ rpm/python/rpmps-py.c 19 Nov 2007 18:57:58 -0000 1.12
@@ -6,6 +6,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#define _RPMPS_INTERNAL /* XXX rpmps needs iterator */
#include <rpmlib.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmte-py.c
============================================================================
$ cvs diff -u -r1.21 -r1.22 rpmte-py.c
--- rpm/python/rpmte-py.c 20 Jul 2007 22:47:34 -0000 1.21
+++ rpm/python/rpmte-py.c 19 Nov 2007 18:57:58 -0000 1.22
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#include "header-py.h" /* XXX tagNumFromPyObject */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmconstant.h
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmconstant.h
--- rpm/rpmconstant/rpmconstant.h 4 Aug 2007 12:20:09 -0000 1.3
+++ rpm/rpmconstant/rpmconstant.h 19 Nov 2007 18:57:58 -0000 1.4
@@ -1,5 +1,5 @@
/* Nanar <nanardon@zarb.org>
- * $Id: rpmconstant.h,v 1.3 2007/08/04 12:20:09 nanardon Exp $
+ * $Id: rpmconstant.h,v 1.4 2007/11/19 18:57:58 jbj Exp $
*/
#ifndef H_RPMCONSTANT
@@ -20,6 +20,7 @@
#include <header.h>
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmdb.h>
#include <rpmts.h>
#include <rpmte.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.80 -r1.81 db3.c
--- rpm/rpmdb/db3.c 14 Nov 2007 01:17:52 -0000 1.80
+++ rpm/rpmdb/db3.c 19 Nov 2007 18:57:59 -0000 1.81
@@ -12,11 +12,12 @@
#include <sys/ipc.h>
#endif
-#include <rpmtag.h>
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmmacro.h>
#include <rpmurl.h> /* XXX urlPath proto */
+#include <rpmtag.h>
#define _RPMDB_INTERNAL
#include <rpmdb.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.49 -r1.50 dbconfig.c
--- rpm/rpmdb/dbconfig.c 14 Nov 2007 23:56:33 -0000 1.49
+++ rpm/rpmdb/dbconfig.c 19 Nov 2007 18:57:59 -0000 1.50
@@ -4,8 +4,10 @@
#include "system.h"
+#include <popt.h>
#include <rpmtag.h>
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmmacro.h>
#define _RPMDB_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.38 -r1.39 pkgio.c
--- rpm/rpmdb/pkgio.c 18 Nov 2007 17:18:28 -0000 1.38
+++ rpm/rpmdb/pkgio.c 19 Nov 2007 18:57:59 -0000 1.39
@@ -16,10 +16,12 @@
#endif
#include <rpmio_internal.h>
+#include <rpmmacro.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmtag.h>
-#include <rpmdb.h> /* XXX rpmtsFindPubkey */
-#include <rpmmacro.h>
+#include <rpmdb.h>
+#include <pkgio.h>
#define _RPMTS_INTERNAL
#include "rpmts.h"
@@ -31,7 +33,6 @@
#include <rpmwf.h>
#include "header_internal.h"
-#include <pkgio.h>
#include "signature.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/poptDB.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 poptDB.c
--- rpm/rpmdb/poptDB.c 7 Oct 2007 14:00:13 -0000 1.8
+++ rpm/rpmdb/poptDB.c 19 Nov 2007 18:57:59 -0000 1.9
@@ -6,8 +6,10 @@
#include "system.h"
#include <rpmio.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmcli.h>
+
#include "debug.h"
struct rpmQVKArguments_s rpmDBArgs;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.212 -r1.213 rpmdb.c
--- rpm/rpmdb/rpmdb.c 18 Nov 2007 15:29:30 -0000 1.212
+++ rpm/rpmdb/rpmdb.c 19 Nov 2007 18:57:59 -0000 1.213
@@ -9,6 +9,7 @@
#include <sys/file.h>
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmpgp.h>
#include <rpmurl.h>
#define _MIRE_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.28 -r1.29 signature.c
--- rpm/rpmdb/signature.c 19 Nov 2007 17:07:48 -0000 1.28
+++ rpm/rpmdb/signature.c 19 Nov 2007 18:57:59 -0000 1.29
@@ -8,6 +8,7 @@
#endif
#include "rpmio_internal.h"
+#include <rpmcb.h> /* XXX rpmIsVerbose() */
#include <rpmtag.h>
#include <rpmmacro.h> /* XXX for rpmGetPath() */
#include "rpmdb.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.23 -r1.24 sqlite.c
--- rpm/rpmdb/sqlite.c 15 Nov 2007 14:30:25 -0000 1.23
+++ rpm/rpmdb/sqlite.c 19 Nov 2007 18:57:59 -0000 1.24
@@ -35,11 +35,12 @@
#include "system.h"
-#include <rpmtag.h>
#include <rpmio.h>
+#include <rpmlog.h>
#include <rpmmacro.h>
#include <rpmurl.h> /* XXX urlPath proto */
+#include <rpmtag.h>
#define _RPMDB_INTERNAL
#include <rpmdb.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.108 -r1.109 Makefile.am
--- rpm/rpmio/Makefile.am 19 Nov 2007 17:07:48 -0000 1.108
+++ rpm/rpmio/Makefile.am 19 Nov 2007 18:57:59 -0000 1.109
@@ -32,9 +32,9 @@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = \
- argv.h envvar.h fts.h mire.h rpmdav.h rpmhash.h \
+ argv.h envvar.h fts.h mire.h rpmcb.h rpmdav.h rpmhash.h \
rpmio-stub.h rpmmg.h \
- rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmpgp.h \
+ rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmpgp.h \
rpmsq.h rpmsw.h ugid.h
noinst_HEADERS = \
md2.h md4.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.153 -r2.154 macro.c
--- rpm/rpmio/macro.c 19 Nov 2007 17:07:48 -0000 2.153
+++ rpm/rpmio/macro.c 19 Nov 2007 18:57:59 -0000 2.154
@@ -23,7 +23,6 @@
#include <string.h>
#include <ctype.h>
#define rpmlog fprintf
-#define rpmIsVerbose() (0)
#define RPMLOG_ERR stderr
#undef _
#define _(x) x
@@ -59,7 +58,7 @@
const char * rpmMacrofiles = MACROFILES;
#include <rpmio_internal.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
#ifdef WITH_LUA
#include <rpmlua.h>
@@ -1202,10 +1201,15 @@
} else if (STREQ("expand", f, fn)) {
b = buf;
} else if (STREQ("verbose", f, fn)) {
+#if defined(RPMLOG_MASK)
if (negate)
- b = (rpmIsVerbose() ? NULL : buf);
+ b = ((rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_INFO )) ? NULL : buf);
else
- b = (rpmIsVerbose() ? buf : NULL);
+ b = ((rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_INFO )) ? buf : NULL);
+#else
+ /* XXX assume always verbose when running standalone */
+ b = (negate) ? NULL : buf;
+#endif
} else if (STREQ("url2path", f, fn) || STREQ("u2p", f, fn)) {
int ut = urlPath(buf, (const char **)&b);
ut = ut; /* XXX quiet gcc */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmcb.h
============================================================================
$ cvs diff -u -r0 -r2.1 rpmcb.h
--- /dev/null 2007-11-19 19:55:00 +0100
+++ rpmcb.h 2007-11-19 19:58:00 +0100
@@ -0,0 +1,82 @@
+#ifndef H_RPMCB
+#define H_RPMCB
+
+/** \ingroup rpmio
+ * \file rpmio/rpmcb.h
+ */
+
+#include <rpmlog.h>
+
+/**
+ * @todo These convenience macros belong somewhere else.
+ */
+#define rpmSetVerbosity(_lvl) \
+ ((void)rpmlogSetMask( RPMLOG_UPTO( RPMLOG_PRI(_lvl))))
+#define rpmIncreaseVerbosity() \
+ ((void)rpmlogSetMask(((((unsigned)(rpmlogSetMask(0) & 0xff)) << 1) | 1)))
+#define rpmDecreaseVerbosity() \
+ ((void)rpmlogSetMask((((int)(rpmlogSetMask(0) & 0xff)) >> 1)))
+#define rpmIsNormal() \
+ (rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_NOTICE ))
+#define rpmIsVerbose() \
+ (rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_INFO ))
+#define rpmIsDebug() \
+ (rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_DEBUG ))
+
+/*@-redef@*/ /* LCL: ??? */
+typedef /*@abstract@*/ const void * fnpyKey;
+/*@=redef@*/
+
+/**
+ * Bit(s) to identify progress callbacks.
+ */
+typedef enum rpmCallbackType_e {
+ RPMCALLBACK_UNKNOWN = 0,
+ RPMCALLBACK_INST_PROGRESS = (1 << 0),
+ RPMCALLBACK_INST_START = (1 << 1),
+ RPMCALLBACK_INST_OPEN_FILE = (1 << 2),
+ RPMCALLBACK_INST_CLOSE_FILE = (1 << 3),
+ RPMCALLBACK_TRANS_PROGRESS = (1 << 4),
+ RPMCALLBACK_TRANS_START = (1 << 5),
+ RPMCALLBACK_TRANS_STOP = (1 << 6),
+ RPMCALLBACK_UNINST_PROGRESS = (1 << 7),
+ RPMCALLBACK_UNINST_START = (1 << 8),
+ RPMCALLBACK_UNINST_STOP = (1 << 9),
+ RPMCALLBACK_REPACKAGE_PROGRESS = (1 << 10),
+ RPMCALLBACK_REPACKAGE_START = (1 << 11),
+ RPMCALLBACK_REPACKAGE_STOP = (1 << 12),
+ RPMCALLBACK_UNPACK_ERROR = (1 << 13),
+ RPMCALLBACK_CPIO_ERROR = (1 << 14)
+} rpmCallbackType;
+
+/**
+ */
+typedef void * rpmCallbackData;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ */
+typedef void * (*rpmCallbackFunction)
+ (/*@null@*/ const void * h,
+ const rpmCallbackType what,
+ const uint64_t amount,
+ const uint64_t total,
+ /*@null@*/ fnpyKey key,
+ /*@null@*/ rpmCallbackData data)
+ /*@globals internalState@*/
+ /*@modifies internalState@*/;
+
+/**
+ */
+/*@unused@*/
+void urlSetCallback(rpmCallbackFunction notify, rpmCallbackData notifyData,
+ int notifyCount);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_RPMCB */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.103 -r1.104 rpmio.c
--- rpm/rpmio/rpmio.c 16 Nov 2007 02:19:06 -0000 1.103
+++ rpm/rpmio/rpmio.c 19 Nov 2007 18:57:59 -0000 1.104
@@ -106,7 +106,7 @@
#include <rpmdav.h>
#include "ugid.h"
-#include "rpmmessages.h"
+#include "rpmcb.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
============================================================================
$ cvs diff -u -r1.61 -r1.62 rpmio.h
--- rpm/rpmio/rpmio.h 15 Nov 2007 14:56:21 -0000 1.61
+++ rpm/rpmio/rpmio.h 19 Nov 2007 18:57:59 -0000 1.62
@@ -440,6 +440,7 @@
* utime(2) clone.
* @todo Implement remotely.
*/
+struct utimbuf;
int Utime(const char * path, const struct utimbuf * buf)
/*@globals errno, fileSystem, internalState @*/
/*@modifies errno, fileSystem, internalState @*/;
@@ .
rm -f rpm/rpmio/rpmmessages.h <<'@@ .'
Index: rpm/rpmio/rpmmessages.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/url.c
============================================================================
$ cvs diff -u -r1.43 -r1.44 url.c
--- rpm/rpmio/url.c 15 Nov 2007 17:27:59 -0000 1.43
+++ rpm/rpmio/url.c 19 Nov 2007 18:57:59 -0000 1.44
@@ -7,7 +7,7 @@
#include <netinet/in.h>
#include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmcb.h>
#include <rpmio_internal.h>
#ifdef WITH_NEON
#include <rpmdav.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmcmp.c
============================================================================
$ cvs diff -u -r2.3 -r2.4 rpmcmp.c
--- rpm/tools/rpmcmp.c 4 Oct 2007 07:20:44 -0000 2.3
+++ rpm/tools/rpmcmp.c 19 Nov 2007 18:58:00 -0000 2.4
@@ -1,5 +1,7 @@
#include "system.h"
+
#include <rpmio_internal.h>
+#include <rpmcb.h> /* XXX fnpyKey */
#include <rpmlib.h>
#define _RPMDS_INTERNAL
#define _RPMEVR_INTERNAL
@@ .
Received on Mon Nov 19 19:58:01 2007