RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 16-Jul-2007 03:32:33
Branch: HEAD Handle: 2007071602322508
Modified files:
rpm CHANGES build.c rpmqv.c
rpm/build expression.c misc.c names.c
parseBuildInstallClean.c parseChangelog.c
parseDescription.c parseFiles.c parseReqs.c
parseScript.c poptBT.c reqprov.c spec.c
rpm/lib fs.c misc.c misc.h package.c poptALL.c poptI.c
poptQV.c psm.c query.c rpmal.c rpmfc.c rpmgi.c
rpminstall.c rpmlead.c rpmlib.h rpmlock.c rpmps.c
rpmrollback.c rpmsx.c rpmte.c signature.c
signature.h transaction.c verify.c
rpm/rpmdb db3.c dbconfig.c hdrNVR.c hdrinline.h header.c
header.h poptDB.c sqlite.c tagname.c
rpm/tools rpmdeps.c
Log:
- refactor rpmio.h include out of header files.
Summary:
Revision Changes Path
1.1472 +1 -0 rpm/CHANGES
2.105 +1 -0 rpm/build.c
2.30 +1 -0 rpm/build/expression.c
2.22 +1 -0 rpm/build/misc.c
1.32 +1 -0 rpm/build/names.c
2.21 +1 -0 rpm/build/parseBuildInstallClean.c
2.31 +1 -0 rpm/build/parseChangelog.c
2.29 +1 -0 rpm/build/parseDescription.c
2.28 +1 -0 rpm/build/parseFiles.c
2.47 +1 -0 rpm/build/parseReqs.c
2.48 +1 -0 rpm/build/parseScript.c
2.10 +1 -0 rpm/build/poptBT.c
1.69 +1 -0 rpm/build/reqprov.c
2.149 +1 -0 rpm/build/spec.c
2.53 +1 -0 rpm/lib/fs.c
2.140 +3 -2 rpm/lib/misc.c
2.66 +3 -3 rpm/lib/misc.h
2.140 +4 -2 rpm/lib/package.c
2.33 +1 -0 rpm/lib/poptALL.c
2.33 +1 -0 rpm/lib/poptI.c
2.40 +1 -0 rpm/lib/poptQV.c
2.207 +2 -1 rpm/lib/psm.c
2.175 +1 -0 rpm/lib/query.c
2.59 +1 -0 rpm/lib/rpmal.c
1.10 +1 -0 rpm/lib/rpmfc.c
2.28 +1 -0 rpm/lib/rpmgi.c
1.150 +1 -0 rpm/lib/rpminstall.c
2.43 +1 -0 rpm/lib/rpmlead.c
2.426 +7 -8 rpm/lib/rpmlib.h
2.13 +1 -0 rpm/lib/rpmlock.c
2.11 +1 -0 rpm/lib/rpmps.c
1.7 +1 -0 rpm/lib/rpmrollback.c
2.15 +1 -0 rpm/lib/rpmsx.c
2.47 +1 -0 rpm/lib/rpmte.c
2.168 +4 -2 rpm/lib/signature.c
2.43 +6 -6 rpm/lib/signature.h
1.327 +2 -0 rpm/lib/transaction.c
2.167 +1 -0 rpm/lib/verify.c
1.68 +1 -0 rpm/rpmdb/db3.c
1.41 +1 -0 rpm/rpmdb/dbconfig.c
1.6 +1 -0 rpm/rpmdb/hdrNVR.c
1.9 +8 -8 rpm/rpmdb/hdrinline.h
1.52 +6 -4 rpm/rpmdb/header.c
1.16 +2 -3 rpm/rpmdb/header.h
1.7 +1 -0 rpm/rpmdb/poptDB.c
1.9 +1 -0 rpm/rpmdb/sqlite.c
1.5 +1 -0 rpm/rpmdb/tagname.c
1.118 +1 -0 rpm/rpmqv.c
2.10 +1 -0 rpm/tools/rpmdeps.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1471 -r1.1472 CHANGES
--- rpm/CHANGES 16 Jul 2007 00:15:20 -0000 1.1471
+++ rpm/CHANGES 16 Jul 2007 01:32:25 -0000 1.1472
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: refactor rpmio.h include out of header files.
- jbj: patch macro seems sufficiently functional, delete the old "stuff".
- jbj: add stub vectors for rpmio I/O API.
- jbj: drop support for internal lua.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build.c
============================================================================
$ cvs diff -u -r2.104 -r2.105 build.c
--- rpm/build.c 25 May 2007 17:35:52 -0000 2.104
+++ rpm/build.c 16 Jul 2007 01:32:25 -0000 2.105
@@ -4,6 +4,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include <rpmbuild.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/expression.c
============================================================================
$ cvs diff -u -r2.29 -r2.30 expression.c
--- rpm/build/expression.c 25 May 2007 17:35:56 -0000 2.29
+++ rpm/build/expression.c 16 Jul 2007 01:32:26 -0000 2.30
@@ -13,6 +13,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmbuild.h>
#include <rpmlib.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/misc.c
============================================================================
$ cvs diff -u -r2.21 -r2.22 misc.c
--- rpm/build/misc.c 23 Jun 2002 19:47:12 -0000 2.21
+++ rpm/build/misc.c 16 Jul 2007 01:32:26 -0000 2.22
@@ -3,6 +3,7 @@
*/
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/names.c
============================================================================
$ cvs diff -u -r1.31 -r1.32 names.c
--- rpm/build/names.c 25 May 2007 17:35:56 -0000 1.31
+++ rpm/build/names.c 16 Jul 2007 01:32:26 -0000 1.32
@@ -7,6 +7,7 @@
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseBuildInstallClean.c
============================================================================
$ cvs diff -u -r2.20 -r2.21 parseBuildInstallClean.c
--- rpm/build/parseBuildInstallClean.c 30 May 2007 02:49:32 -0000
2.20
+++ rpm/build/parseBuildInstallClean.c 16 Jul 2007 01:32:26 -0000
2.21
@@ -4,6 +4,7 @@
*/
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseChangelog.c
============================================================================
$ cvs diff -u -r2.30 -r2.31 parseChangelog.c
--- rpm/build/parseChangelog.c 20 Jun 2007 15:58:15 -0000 2.30
+++ rpm/build/parseChangelog.c 16 Jul 2007 01:32:26 -0000 2.31
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseDescription.c
============================================================================
$ cvs diff -u -r2.28 -r2.29 parseDescription.c
--- rpm/build/parseDescription.c 16 Apr 2003 22:13:18 -0000 2.28
+++ rpm/build/parseDescription.c 16 Jul 2007 01:32:26 -0000 2.29
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseFiles.c
============================================================================
$ cvs diff -u -r2.27 -r2.28 parseFiles.c
--- rpm/build/parseFiles.c 17 Oct 2001 16:43:36 -0000 2.27
+++ rpm/build/parseFiles.c 16 Jul 2007 01:32:26 -0000 2.28
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseReqs.c
============================================================================
$ cvs diff -u -r2.46 -r2.47 parseReqs.c
--- rpm/build/parseReqs.c 25 May 2007 17:35:56 -0000 2.46
+++ rpm/build/parseReqs.c 16 Jul 2007 01:32:26 -0000 2.47
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#define _RPMEVR_INTERNAL
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseScript.c
============================================================================
$ cvs diff -u -r2.47 -r2.48 parseScript.c
--- rpm/build/parseScript.c 25 May 2007 17:35:56 -0000 2.47
+++ rpm/build/parseScript.c 16 Jul 2007 01:32:26 -0000 2.48
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#define _RPMEVR_INTERNAL
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/poptBT.c
============================================================================
$ cvs diff -u -r2.9 -r2.10 poptBT.c
--- rpm/build/poptBT.c 25 May 2007 17:35:56 -0000 2.9
+++ rpm/build/poptBT.c 16 Jul 2007 01:32:26 -0000 2.10
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include <rpmbuild.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/reqprov.c
============================================================================
$ cvs diff -u -r1.68 -r1.69 reqprov.c
--- rpm/build/reqprov.c 9 Jun 2007 19:07:57 -0000 1.68
+++ rpm/build/reqprov.c 16 Jul 2007 01:32:26 -0000 1.69
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#define _RPMEVR_INTERNAL
#include "rpmbuild.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/spec.c
============================================================================
$ cvs diff -u -r2.148 -r2.149 spec.c
--- rpm/build/spec.c 6 Jul 2007 18:22:05 -0000 2.148
+++ rpm/build/spec.c 16 Jul 2007 01:32:26 -0000 2.149
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include "buildio.h"
#include "rpmds.h"
#include "rpmfi.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fs.c
============================================================================
$ cvs diff -u -r2.52 -r2.53 fs.c
--- rpm/lib/fs.c 9 Jul 2007 22:31:56 -0000 2.52
+++ rpm/lib/fs.c 16 Jul 2007 01:32:28 -0000 2.53
@@ -4,6 +4,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h> /* XXX for rpmGetPath */
#include "fs.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/misc.c
============================================================================
$ cvs diff -u -r2.139 -r2.140 misc.c
--- rpm/lib/misc.c 15 Jul 2007 16:32:16 -0000 2.139
+++ rpm/lib/misc.c 16 Jul 2007 01:32:28 -0000 2.140
@@ -115,7 +115,7 @@
return putenv(a);
}
-int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
+int makeTempFile(const char * prefix, const char ** fnptr, void * fdptr)
{
const char * tpmacro = "%{?_tmppath:%{_tmppath}}%{!?_tmppath:/var/tmp}";
const char * tempfn = NULL;
@@ -210,7 +210,8 @@
else
tempfn = _free(tempfn);
/[EMAIL PROTECTED]@*/
- *fdptr = fd;
+ if (fdptr)
+ *(FD_t *)fdptr = fd;
return 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/misc.h
============================================================================
$ cvs diff -u -r2.65 -r2.66 misc.h
--- rpm/lib/misc.h 9 Jul 2007 15:38:53 -0000 2.65
+++ rpm/lib/misc.h 16 Jul 2007 01:32:28 -0000 2.66
@@ -87,13 +87,13 @@
* The file name and the open file handle are returned.
*
* @param prefix leading part of temp file path
- * @retval fnptr temp file name (or NULL)
- * @retval fdptr temp file handle
+ * @retval *fnptr temp file name (or NULL)
+ * @retval *fdptr temp file handle
* @return 0 on success
*/
int makeTempFile(/[EMAIL PROTECTED]@*/ const char * prefix,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char ** fnptr,
- /[EMAIL PROTECTED]@*/ FD_t * fdptr)
+ /[EMAIL PROTECTED]@*/ void * fdptr)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno,
fileSystem, internalState @*/
/[EMAIL PROTECTED] *fnptr, *fdptr, rpmGlobalMacroContext,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.139 -r2.140 package.c
--- rpm/lib/package.c 10 Jul 2007 18:13:29 -0000 2.139
+++ rpm/lib/package.c 16 Jul 2007 01:32:28 -0000 2.140
@@ -646,8 +646,9 @@
return rc;
}
-rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, const char ** msg)
+rpmRC rpmReadHeader(rpmts ts, void * _fd, Header *hdrp, const char ** msg)
{
+ FD_t fd = _fd;
char buf[BUFSIZ];
int_32 block[4];
int_32 il;
@@ -750,8 +751,9 @@
}
/[EMAIL PROTECTED]@*/ /* LCL: segfault */
-rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
+rpmRC rpmReadPackageFile(rpmts ts, void * _fd, const char * fn, Header *
hdrp)
{
+ FD_t fd = _fd;
pgpDig dig;
char buf[8*BUFSIZ];
ssize_t count;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.32 -r2.33 poptALL.c
--- rpm/lib/poptALL.c 9 Jul 2007 22:31:56 -0000 2.32
+++ rpm/lib/poptALL.c 16 Jul 2007 01:32:28 -0000 2.33
@@ -6,6 +6,7 @@
#include "system.h"
const char *__progname;
+#include <rpmio.h>
#include <rpmcli.h>
#include <rpmlua.h> /* XXX rpmluaFree() */
#include <fs.h> /* XXX rpmFreeFilesystems() */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptI.c
============================================================================
$ cvs diff -u -r2.32 -r2.33 poptI.c
--- rpm/lib/poptI.c 25 May 2007 17:36:02 -0000 2.32
+++ rpm/lib/poptI.c 16 Jul 2007 01:32:28 -0000 2.33
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.39 -r2.40 poptQV.c
--- rpm/lib/poptQV.c 25 May 2007 17:36:02 -0000 2.39
+++ rpm/lib/poptQV.c 16 Jul 2007 01:32:28 -0000 2.40
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include <rpmbuild.h>
#include <rpmgi.h> /* XXX for giFlags */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.206 -r2.207 psm.c
--- rpm/lib/psm.c 15 Jul 2007 16:32:16 -0000 2.206
+++ rpm/lib/psm.c 16 Jul 2007 01:32:28 -0000 2.207
@@ -163,9 +163,10 @@
}
/[EMAIL PROTECTED]@*/
-rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
+rpmRC rpmInstallSourcePackage(rpmts ts, void * _fd,
const char ** specFilePtr, const char ** cookie)
{
+ FD_t fd = _fd;
int scareMem = 1; /* XXX fi->h is needed */
rpmfi fi = NULL;
const char * _sourcedir = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.174 -r2.175 query.c
--- rpm/lib/query.c 25 May 2007 17:36:02 -0000 2.174
+++ rpm/lib/query.c 16 Jul 2007 01:32:28 -0000 2.175
@@ -11,6 +11,7 @@
/[EMAIL PROTECTED]@*/
#endif
+#include <rpmio.h>
#include <rpmcli.h>
#include "rpmdb.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmal.c
============================================================================
$ cvs diff -u -r2.58 -r2.59 rpmal.c
--- rpm/lib/rpmal.c 25 May 2007 17:36:02 -0000 2.58
+++ rpm/lib/rpmal.c 16 Jul 2007 01:32:28 -0000 2.59
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include "rpmal.h"
#define _RPMDS_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpmfc.c
--- rpm/lib/rpmfc.c 14 Jul 2007 00:33:23 -0000 1.9
+++ rpm/lib/rpmfc.c 16 Jul 2007 01:32:28 -0000 1.10
@@ -7,6 +7,7 @@
#include "magic.h"
#endif
+#include <rpmio.h>
#define _RPMEVR_INTERNAL
#include <rpmbuild.h>
#include <argv.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.27 -r2.28 rpmgi.c
--- rpm/lib/rpmgi.c 15 Jul 2007 16:32:16 -0000 2.27
+++ rpm/lib/rpmgi.c 16 Jul 2007 01:32:28 -0000 2.28
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmte.h> /* XXX rpmElementType */
#define _RPMGI_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.149 -r1.150 rpminstall.c
--- rpm/lib/rpminstall.c 15 Jul 2007 16:32:16 -0000 1.149
+++ rpm/lib/rpminstall.c 16 Jul 2007 01:32:28 -0000 1.150
@@ -4,6 +4,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include "rpmdb.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlead.c
============================================================================
$ cvs diff -u -r2.42 -r2.43 rpmlead.c
--- rpm/lib/rpmlead.c 9 Jul 2007 22:31:56 -0000 2.42
+++ rpm/lib/rpmlead.c 16 Jul 2007 01:32:28 -0000 2.43
@@ -11,6 +11,7 @@
#include <netinet/in.h>
#include <rpmlib.h>
+#include <rpmio.h>
#include "signature.h"
#include "rpmlead.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.425 -r2.426 rpmlib.h
--- rpm/lib/rpmlib.h 6 Jul 2007 19:34:44 -0000 2.425
+++ rpm/lib/rpmlib.h 16 Jul 2007 01:32:28 -0000 2.426
@@ -8,7 +8,6 @@
*
*/
-#include "rpmio.h"
#include "rpmmessages.h"
#include "rpmerr.h"
#include "header.h"
@@ -809,12 +808,12 @@
/**
* Return checked and loaded header.
* @param ts transaction set
- * @param fd file handle
+ * @param _fd file handle
* @retval hdrp address of header (or NULL)
* @retval *msg verification error message (or NULL)
* @return RPMRC_OK on success
*/
-rpmRC rpmReadHeader(rpmts ts, FD_t fd, /[EMAIL PROTECTED]@*/ Header *hdrp,
+rpmRC rpmReadHeader(rpmts ts, void * _fd, /[EMAIL PROTECTED]@*/ Header *hdrp,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char ** msg)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] ts, *hdrp, *msg, rpmGlobalMacroContext,
@@ -823,26 +822,26 @@
/**
* Return package header from file handle, verifying digests/signatures.
* @param ts transaction set
- * @param fd file handle
+ * @param _fd file handle
* @param fn file name
* @retval hdrp address of header (or NULL)
* @return RPMRC_OK on success
*/
-rpmRC rpmReadPackageFile(rpmts ts, FD_t fd,
+rpmRC rpmReadPackageFile(rpmts ts, void * _fd,
const char * fn, /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
Header * hdrp)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
- /[EMAIL PROTECTED] ts, fd, *hdrp, rpmGlobalMacroContext,
+ /[EMAIL PROTECTED] ts, _fd, *hdrp, rpmGlobalMacroContext,
fileSystem, internalState @*/;
/**
* Install source package.
* @param ts transaction set
- * @param fd file handle
+ * @param _fd file handle
* @retval specFilePtr address of spec file name (or NULL)
* @retval cookie address of cookie pointer (or NULL)
* @return rpmRC return code
*/
-rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
+rpmRC rpmInstallSourcePackage(rpmts ts, void * _fd,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char
** specFilePtr,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char
** cookie)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlock.c
============================================================================
$ cvs diff -u -r2.12 -r2.13 rpmlock.c
--- rpm/lib/rpmlock.c 25 May 2007 17:36:02 -0000 2.12
+++ rpm/lib/rpmlock.c 16 Jul 2007 01:32:28 -0000 2.13
@@ -1,6 +1,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#include "rpmts.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmps.c
============================================================================
$ cvs diff -u -r2.10 -r2.11 rpmps.c
--- rpm/lib/rpmps.c 25 May 2007 17:36:02 -0000 2.10
+++ rpm/lib/rpmps.c 16 Jul 2007 01:32:28 -0000 2.11
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#define _RPMPS_INTERNAL
#include "rpmps.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpmrollback.c
--- rpm/lib/rpmrollback.c 15 Jul 2007 16:32:16 -0000 1.6
+++ rpm/lib/rpmrollback.c 16 Jul 2007 01:32:28 -0000 1.7
@@ -4,6 +4,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include "rpmdb.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmsx.c
============================================================================
$ cvs diff -u -r2.14 -r2.15 rpmsx.c
--- rpm/lib/rpmsx.c 10 Jul 2007 18:45:06 -0000 2.14
+++ rpm/lib/rpmsx.c 16 Jul 2007 01:32:28 -0000 2.15
@@ -4,6 +4,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h> /* for rpmGetPath() */
#define _RPMSX_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.46 -r2.47 rpmte.c
--- rpm/lib/rpmte.c 19 Jun 2007 02:32:42 -0000 2.46
+++ rpm/lib/rpmte.c 16 Jul 2007 01:32:28 -0000 2.47
@@ -4,6 +4,7 @@
*/
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include "psm.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/signature.c
============================================================================
$ cvs diff -u -r2.167 -r2.168 signature.c
--- rpm/lib/signature.c 10 Jul 2007 20:13:43 -0000 2.167
+++ rpm/lib/signature.c 16 Jul 2007 01:32:28 -0000 2.168
@@ -151,9 +151,10 @@
0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
};
-rpmRC rpmReadSignature(FD_t fd, Header * sighp, sigType sig_type,
+rpmRC rpmReadSignature(void * _fd, Header * sighp, sigType sig_type,
const char ** msg)
{
+ FD_t fd = _fd;
char buf[BUFSIZ];
int_32 block[4];
int_32 il;
@@ -350,8 +351,9 @@
return rc;
}
-int rpmWriteSignature(FD_t fd, Header sigh)
+int rpmWriteSignature(void * _fd, Header sigh)
{
+ FD_t fd = _fd;
static byte buf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
int sigSize, pad;
int rc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/signature.h
============================================================================
$ cvs diff -u -r2.42 -r2.43 signature.h
--- rpm/lib/signature.h 25 May 2007 17:36:02 -0000 2.42
+++ rpm/lib/signature.h 16 Jul 2007 01:32:28 -0000 2.43
@@ -40,26 +40,26 @@
/** \ingroup signature
* Read (and verify header+payload size) signature header.
* If an old-style signature is found, we emulate a new style one.
- * @param fd file handle
+ * @param _fd file handle
* @retval sighp address of (signature) header (or NULL)
* @param sig_type type of signature header to read (from lead)
* @retval msg failure msg
* @return rpmRC return code
*/
-rpmRC rpmReadSignature(FD_t fd, /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
Header *sighp,
+rpmRC rpmReadSignature(void * _fd, /[EMAIL PROTECTED]@*/ /[EMAIL
PROTECTED]@*/ Header *sighp,
sigType sig_type, /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char ** msg)
/[EMAIL PROTECTED] fileSystem @*/
- /[EMAIL PROTECTED] fd, *sighp, *msg, fileSystem @*/;
+ /[EMAIL PROTECTED] _fd, *sighp, *msg, fileSystem @*/;
/** \ingroup signature
* Write signature header.
- * @param fd file handle
+ * @param _fd file handle
* @param sigh (signature) header
* @return 0 on success, 1 on error
*/
-int rpmWriteSignature(FD_t fd, Header sigh)
+int rpmWriteSignature(void * _fd, Header sigh)
/[EMAIL PROTECTED] fileSystem @*/
- /[EMAIL PROTECTED] fd, sigh, fileSystem @*/;
+ /[EMAIL PROTECTED] _fd, sigh, fileSystem @*/;
/** \ingroup signature
* Generate signature(s) from a header+payload file, save in signature
header.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.326 -r1.327 transaction.c
--- rpm/lib/transaction.c 12 Jul 2007 10:00:06 -0000 1.326
+++ rpm/lib/transaction.c 16 Jul 2007 01:32:28 -0000 1.327
@@ -3,6 +3,8 @@
*/
#include "system.h"
+
+#include <rpmio.h>
#include "rpmcli.h" /* IDTX prototypes */
#include <rpmlib.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
============================================================================
$ cvs diff -u -r2.166 -r2.167 verify.c
--- rpm/lib/verify.c 29 Jun 2007 12:38:49 -0000 2.166
+++ rpm/lib/verify.c 16 Jul 2007 01:32:28 -0000 2.167
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#define _RPMPS_INTERNAL /* XXX rpmps needs iterator. */
#include <rpmcli.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.67 -r1.68 db3.c
--- rpm/rpmdb/db3.c 10 Jul 2007 17:55:54 -0000 1.67
+++ rpm/rpmdb/db3.c 16 Jul 2007 01:32:32 -0000 1.68
@@ -13,6 +13,7 @@
#endif
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#include <rpmurl.h> /* XXX urlPath proto */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.40 -r1.41 dbconfig.c
--- rpm/rpmdb/dbconfig.c 30 Jun 2007 15:55:06 -0000 1.40
+++ rpm/rpmdb/dbconfig.c 16 Jul 2007 01:32:32 -0000 1.41
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#define _RPMDB_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 9 Jun 2007 19:08:00 -0000 1.5
+++ rpm/rpmdb/hdrNVR.c 16 Jul 2007 01:32:32 -0000 1.6
@@ -4,6 +4,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrinline.h
============================================================================
$ cvs diff -u -r1.8 -r1.9 hdrinline.h
--- rpm/rpmdb/hdrinline.h 9 Jun 2007 19:08:00 -0000 1.8
+++ rpm/rpmdb/hdrinline.h 16 Jul 2007 01:32:32 -0000 1.9
@@ -192,32 +192,32 @@
/** \ingroup header
* Read (and load) header from file handle.
- * @param fd file handle
+ * @param _fd file handle
* @param magicp read (and verify) 8 bytes of (magic, 0)?
* @return header (or NULL on error)
*/
/[EMAIL PROTECTED]@*/ static inline
-/[EMAIL PROTECTED]@*/ Header headerRead(FD_t fd, enum hMagic magicp)
- /[EMAIL PROTECTED] fd @*/
+/[EMAIL PROTECTED]@*/ Header headerRead(void * _fd, enum hMagic magicp)
+ /[EMAIL PROTECTED] _fd @*/
{
- return hdrVec->hdrread(fd, magicp);
+ return hdrVec->hdrread(_fd, magicp);
}
/** \ingroup header
* Write (with unload) header to file handle.
- * @param fd file handle
+ * @param _fd file handle
* @param h header
* @param magicp prefix write with 8 bytes of (magic, 0)?
* @return 0 on success, 1 on error
*/
/[EMAIL PROTECTED]@*/ static inline
-int headerWrite(FD_t fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic magicp)
- /[EMAIL PROTECTED] fd, h @*/
+int headerWrite(void * _fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
+ /[EMAIL PROTECTED] _fd, h @*/
{
/[EMAIL PROTECTED]@*/
if (h == NULL) return 0;
/[EMAIL PROTECTED]@*/
- return (h2hv(h)->hdrwrite) (fd, h, magicp);
+ return (h2hv(h)->hdrwrite) (_fd, h, magicp);
}
/** \ingroup header
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.51 -r1.52 header.c
--- rpm/rpmdb/header.c 10 Jul 2007 13:05:33 -0000 1.51
+++ rpm/rpmdb/header.c 16 Jul 2007 01:32:32 -0000 1.52
@@ -1335,14 +1335,15 @@
/** \ingroup header
* Read (and load) header from file handle.
- * @param fd file handle
+ * @param _fd file handle
* @param magicp read (and verify) 8 bytes of (magic, 0)?
* @return header (or NULL on error)
*/
static /[EMAIL PROTECTED]@*/
-Header headerRead(FD_t fd, enum hMagic magicp)
+Header headerRead(void * _fd, enum hMagic magicp)
/[EMAIL PROTECTED] fd @*/
{
+ FD_t fd = _fd;
int_32 block[4];
int_32 reserved;
int_32 * ei = NULL;
@@ -1420,16 +1421,17 @@
/** \ingroup header
* Write (with unload) header to file handle.
- * @param fd file handle
+ * @param _fd file handle
* @param h header
* @param magicp prefix write with 8 bytes of (magic, 0)?
* @return 0 on success, 1 on error
*/
static
-int headerWrite(FD_t fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic magicp)
+int headerWrite(void * _fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fd, h, fileSystem @*/
{
+ FD_t fd = _fd;
ssize_t nb;
int length;
const void * uh;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.h
============================================================================
$ cvs diff -u -r1.15 -r1.16 header.h
--- rpm/rpmdb/header.h 19 Jun 2007 02:32:43 -0000 1.15
+++ rpm/rpmdb/header.h 16 Jul 2007 01:32:32 -0000 1.16
@@ -80,7 +80,6 @@
/* RPM - Copyright (C) 1995-2001 Red Hat Software */
#include <stdio.h>
-#include "rpmio.h"
#ifdef __cplusplus
extern "C" {
@@ -460,7 +459,7 @@
* @return header (or NULL on error)
*/
typedef
-/[EMAIL PROTECTED]@*/ Header (*HDRread) (FD_t fd, enum hMagic magicp)
+/[EMAIL PROTECTED]@*/ Header (*HDRread) (void * fd, enum hMagic magicp)
/[EMAIL PROTECTED] fd @*/;
/** \ingroup header
@@ -471,7 +470,7 @@
* @return 0 on success, 1 on error
*/
typedef
-int (*HDRwrite) (FD_t fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic magicp)
+int (*HDRwrite) (void * fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fd, h, fileSystem @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/poptDB.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 poptDB.c
--- rpm/rpmdb/poptDB.c 25 May 2007 17:36:33 -0000 1.6
+++ rpm/rpmdb/poptDB.c 16 Jul 2007 01:32:32 -0000 1.7
@@ -5,6 +5,7 @@
#include "system.h"
+#include <rpmio.h>
#include <rpmcli.h>
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 sqlite.c
--- rpm/rpmdb/sqlite.c 10 Jul 2007 17:18:12 -0000 1.8
+++ rpm/rpmdb/sqlite.c 16 Jul 2007 01:32:32 -0000 1.9
@@ -38,6 +38,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include <rpmmacro.h>
#include <rpmurl.h> /* XXX urlPath proto */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/tagname.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 tagname.c
--- rpm/rpmdb/tagname.c 25 May 2007 17:36:33 -0000 1.4
+++ rpm/rpmdb/tagname.c 16 Jul 2007 01:32:32 -0000 1.5
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpmlib.h>
+#include <rpmio.h>
#include "debug.h"
/[EMAIL PROTECTED] headerTagTableEntry @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.117 -r1.118 rpmqv.c
--- rpm/rpmqv.c 6 Jul 2007 18:45:52 -0000 1.117
+++ rpm/rpmqv.c 16 Jul 2007 01:32:25 -0000 1.118
@@ -11,6 +11,7 @@
#define IAM_RPMK
#endif
+#include <rpmio.h>
#include <rpmcli.h>
#include <rpmbuild.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmdeps.c
============================================================================
$ cvs diff -u -r2.9 -r2.10 rpmdeps.c
--- rpm/tools/rpmdeps.c 25 May 2007 17:36:41 -0000 2.9
+++ rpm/tools/rpmdeps.c 16 Jul 2007 01:32:33 -0000 2.10
@@ -1,6 +1,7 @@
#include "system.h"
const char *__progname;
+#include <rpmio.h>
#include <rpmcli.h>
#include <argv.h>
#include <rpmds.h>
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
