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: 30-Jul-2007 19:34:37
Branch: HEAD Handle: 2007073018343502
Modified files:
rpm CHANGES
rpm/build pack.c
rpm/lib psm.c rpmchecksig.c rpmgi.c signature.c
rpm/python header-py.c
rpm/rpmdb hdrinline.h header.c header.h rpmdb.c
Removed files:
rpm/tools convertdb1.c
Log:
- HEADER_MAGIC_YES always: remove the enum and arguments everywhere.
Summary:
Revision Changes Path
1.1530 +1 -0 rpm/CHANGES
2.216 +4 -4 rpm/build/pack.c
2.215 +1 -1 rpm/lib/psm.c
1.120 +2 -2 rpm/lib/rpmchecksig.c
2.30 +1 -1 rpm/lib/rpmgi.c
2.170 +8 -8 rpm/lib/signature.c
1.47 +7 -6 rpm/python/header-py.c
1.10 +6 -9 rpm/rpmdb/hdrinline.h
1.53 +7 -21 rpm/rpmdb/header.c
1.17 +3 -14 rpm/rpmdb/header.h
1.144 +3 -3 rpm/rpmdb/rpmdb.c
2.9 +0 -290 rpm/tools/convertdb1.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1529 -r1.1530 CHANGES
--- rpm/CHANGES 30 Jul 2007 17:09:43 -0000 1.1529
+++ rpm/CHANGES 30 Jul 2007 17:34:35 -0000 1.1530
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: HEADER_MAGIC_YES always: remove the enum and arguments everywhere.
- jbj: HEADER_MAGIC_YES always: eliminate HEADER_MAGIC_NO usages.
- rse: provide support for GNU binutils ld(1)'s --as-needed via Autoconf
option --enable-build-maxextlibdep
- jbj: rip CentOS3/x86_64 gcc-3.2.3-49.x86_64 hack-a-round. Fix gcc!
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.215 -r2.216 pack.c
--- rpm/build/pack.c 22 Jul 2007 05:28:58 -0000 2.215
+++ rpm/build/pack.c 30 Jul 2007 17:34:36 -0000 2.216
@@ -611,7 +611,7 @@
}
fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
- if (headerWrite(fd, h, HEADER_MAGIC_YES)) {
+ if (headerWrite(fd, h)) {
rc = RPMERR_NOSPACE;
rpmError(RPMERR_NOSPACE, _("Unable to write temp header\n"));
} else { /* Write the archive and get the size */
@@ -658,7 +658,7 @@
}
fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
- if (headerWrite(fd, h, HEADER_MAGIC_YES)) {
+ if (headerWrite(fd, h)) {
rc = RPMERR_NOSPACE;
rpmError(RPMERR_NOSPACE, _("Unable to write final header\n"));
}
@@ -763,7 +763,7 @@
/* Add signatures to header, and write header into the package. */
/* XXX header+payload digests/signatures might be checked again here. */
- { Header nh = headerRead(ifd, HEADER_MAGIC_YES);
+ { Header nh = headerRead(ifd);
if (nh == NULL) {
rc = RPMERR_READ;
@@ -776,7 +776,7 @@
(void) headerMergeLegacySigs(nh, sig);
#endif
- rc = headerWrite(fd, nh, HEADER_MAGIC_YES);
+ rc = headerWrite(fd, nh);
nh = headerFree(nh);
if (rc) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.214 -r2.215 psm.c
--- rpm/lib/psm.c 30 Jul 2007 01:40:35 -0000 2.214
+++ rpm/lib/psm.c 30 Jul 2007 17:34:36 -0000 2.215
@@ -1858,7 +1858,7 @@
}
/* Write the metadata section into the package. */
- rc = headerWrite(psm->fd, psm->oh, HEADER_MAGIC_YES);
+ rc = headerWrite(psm->fd, psm->oh);
if (rc) break;
}
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.119 -r1.120 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 17 Jul 2007 23:49:14 -0000 1.119
+++ rpm/lib/rpmchecksig.c 30 Jul 2007 17:34:36 -0000 1.120
@@ -656,13 +656,13 @@
dig->nbytes = 0;
/* Read the header from the package. */
- { Header h = headerRead(fd, HEADER_MAGIC_YES);
+ { Header h = headerRead(fd);
if (h == NULL) {
rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
goto exit;
}
- dig->nbytes += headerSizeof(h, HEADER_MAGIC_YES);
+ dig->nbytes += headerSizeof(h);
if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
void * uh;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.29 -r2.30 rpmgi.c
--- rpm/lib/rpmgi.c 24 Jul 2007 12:25:21 -0000 2.29
+++ rpm/lib/rpmgi.c 30 Jul 2007 17:34:36 -0000 2.30
@@ -670,7 +670,7 @@
path = _free(path);
}
if (gi->fd != NULL) {
- Header h = headerRead(gi->fd, HEADER_MAGIC_YES);
+ Header h = headerRead(gi->fd);
if (h != NULL) {
if (!(gi->flags & RPMGI_NOHEADER))
gi->h = headerLink(h);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/signature.c
============================================================================
$ cvs diff -u -r2.169 -r2.170 signature.c
--- rpm/lib/signature.c 30 Jul 2007 01:40:35 -0000 2.169
+++ rpm/lib/signature.c 30 Jul 2007 17:34:36 -0000 2.170
@@ -315,7 +315,7 @@
}
sigh->flags |= HEADERFLAG_ALLOCATED;
- { int sigSize = headerSizeof(sigh, HEADER_MAGIC_YES);
+ { int sigSize = headerSizeof(sigh);
int pad = (8 - (sigSize % 8)) % 8; /* 8-byte pad */
int_32 * archSize = NULL;
@@ -358,11 +358,11 @@
int sigSize, pad;
int rc;
- rc = headerWrite(fd, sigh, HEADER_MAGIC_YES);
+ rc = headerWrite(fd, sigh);
if (rc)
return rc;
- sigSize = headerSizeof(sigh, HEADER_MAGIC_YES);
+ sigSize = headerSizeof(sigh);
pad = (8 - (sigSize % 8)) % 8;
if (pad) {
/[EMAIL PROTECTED]@*/
@@ -720,7 +720,7 @@
fd = Fopen(file, "r.fdio");
if (fd == NULL || Ferror(fd))
goto exit;
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
if (h == NULL)
goto exit;
(void) Fclose(fd); fd = NULL;
@@ -754,13 +754,13 @@
fd = Fopen(file, "r.fdio");
if (fd == NULL || Ferror(fd))
goto exit;
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
if (h == NULL)
goto exit;
(void) Fclose(fd); fd = NULL;
if (makeTempFile(NULL, &fn, &fd))
goto exit;
- if (headerWrite(fd, h, HEADER_MAGIC_YES))
+ if (headerWrite(fd, h))
goto exit;
(void) Fclose(fd); fd = NULL;
if (makeGPGSignature(fn, &sigTag, &pkt, &pktlen, passPhrase)
@@ -772,13 +772,13 @@
fd = Fopen(file, "r.fdio");
if (fd == NULL || Ferror(fd))
goto exit;
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
if (h == NULL)
goto exit;
(void) Fclose(fd); fd = NULL;
if (makeTempFile(NULL, &fn, &fd))
goto exit;
- if (headerWrite(fd, h, HEADER_MAGIC_YES))
+ if (headerWrite(fd, h))
goto exit;
(void) Fclose(fd); fd = NULL;
if (makePGPSignature(fn, &sigTag, &pkt, &pktlen, passPhrase)
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.46 -r1.47 header-py.c
--- rpm/python/header-py.c 5 Jul 2007 17:35:56 -0000 1.46
+++ rpm/python/header-py.c 30 Jul 2007 17:34:36 -0000 1.47
@@ -462,7 +462,8 @@
h = headerCopy(s->h); /* XXX strip region tags, etc */
headerFree(s->h);
}
- len = headerSizeof(h, 0);
+ len = headerSizeof(h);
+ len -= 8; /* XXX HEADER_MAGIC_NO */
buf = headerUnload(h);
h = headerFree(h);
@@ -1051,7 +1052,7 @@
list = PyList_New(0);
Py_BEGIN_ALLOW_THREADS
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
Py_END_ALLOW_THREADS
while (h) {
@@ -1068,7 +1069,7 @@
h = headerFree(h); /* XXX ref held by hdr */
Py_BEGIN_ALLOW_THREADS
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
Py_END_ALLOW_THREADS
}
@@ -1136,7 +1137,7 @@
void * p;
Py_BEGIN_ALLOW_THREADS
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
Py_END_ALLOW_THREADS
while (h) {
@@ -1175,7 +1176,7 @@
h = headerFree(h);
Py_BEGIN_ALLOW_THREADS
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
Py_END_ALLOW_THREADS
}
@@ -1239,7 +1240,7 @@
}
Py_BEGIN_ALLOW_THREADS
- h = headerRead(fd, HEADER_MAGIC_YES);
+ h = headerRead(fd);
Py_END_ALLOW_THREADS
Fclose(fd);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrinline.h
============================================================================
$ cvs diff -u -r1.9 -r1.10 hdrinline.h
--- rpm/rpmdb/hdrinline.h 16 Jul 2007 01:32:32 -0000 1.9
+++ rpm/rpmdb/hdrinline.h 30 Jul 2007 17:34:37 -0000 1.10
@@ -113,17 +113,16 @@
/** \ingroup header
* Return size of on-disk header representation in bytes.
* @param h header
- * @param magicp include size of 8 bytes for (magic, 0)?
* @return size of on-disk header
*/
/[EMAIL PROTECTED]@*/ static inline
-unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h, enum hMagic magicp)
+unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] h @*/
{
/[EMAIL PROTECTED]@*/
if (h == NULL) return 0;
/[EMAIL PROTECTED]@*/
- return (h2hv(h)->hdrsizeof) (h, magicp);
+ return (h2hv(h)->hdrsizeof) (h);
}
/** \ingroup header
@@ -193,31 +192,29 @@
/** \ingroup header
* Read (and load) header from 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(void * _fd, enum hMagic magicp)
+/[EMAIL PROTECTED]@*/ Header headerRead(void * _fd)
/[EMAIL PROTECTED] _fd @*/
{
- return hdrVec->hdrread(_fd, magicp);
+ return hdrVec->hdrread(_fd);
}
/** \ingroup header
* Write (with unload) header to 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(void * _fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
+int headerWrite(void * _fd, /[EMAIL PROTECTED]@*/ Header h)
/[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);
}
/** \ingroup header
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.52 -r1.53 header.c
--- rpm/rpmdb/header.c 16 Jul 2007 01:32:32 -0000 1.52
+++ rpm/rpmdb/header.c 30 Jul 2007 17:34:37 -0000 1.53
@@ -296,11 +296,10 @@
/** \ingroup header
* Return size of on-disk header representation in bytes.
* @param h header
- * @param magicp include size of 8 bytes for (magic, 0)?
* @return size of on-disk header
*/
static
-unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h, enum hMagic magicp)
+unsigned int headerSizeof(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] h @*/
{
indexEntry entry;
@@ -313,13 +312,7 @@
headerSort(h);
- switch (magicp) {
- case HEADER_MAGIC_YES:
- size += sizeof(header_magic);
- break;
- case HEADER_MAGIC_NO:
- break;
- }
+ size += sizeof(header_magic); /* XXX HEADER_MAGIC_YES */
/[EMAIL PROTECTED]@*/
size += 2 * sizeof(int_32); /* count of index entries */
@@ -1336,11 +1329,10 @@
/** \ingroup header
* Read (and load) header from 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(void * _fd, enum hMagic magicp)
+Header headerRead(void * _fd)
/[EMAIL PROTECTED] fd @*/
{
FD_t fd = _fd;
@@ -1356,8 +1348,7 @@
memset(block, 0, sizeof(block));
i = 2;
- if (magicp == HEADER_MAGIC_YES)
- i += 2;
+ i += 2; /* XXX HEADER_MAGIC_YES */
/[EMAIL PROTECTED]@*/ /* FIX: cast? */
if (timedRead(fd, (char *)block, i*sizeof(*block)) != (i *
sizeof(*block)))
@@ -1367,7 +1358,7 @@
i = 0;
/[EMAIL PROTECTED]@*/
- if (magicp == HEADER_MAGIC_YES) {
+ { /* XXX HEADER_MAGIC_YES */
magic = block[i++];
if (memcmp(&magic, header_magic, sizeof(magic)))
goto exit;
@@ -1423,11 +1414,10 @@
* Write (with unload) header to 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(void * _fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
+int headerWrite(void * _fd, /[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fd, h, fileSystem @*/
{
@@ -1443,8 +1433,7 @@
/[EMAIL PROTECTED]@*/
if (uh == NULL)
return 1;
- switch (magicp) {
- case HEADER_MAGIC_YES:
+ { /* XXX HEADER_MAGIC_YES */
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
nb = Fwrite(header_magic, sizeof(char), sizeof(header_magic), fd);
@@ -1452,9 +1441,6 @@
/[EMAIL PROTECTED]@*/
if (nb != sizeof(header_magic))
goto exit;
- break;
- case HEADER_MAGIC_NO:
- break;
}
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.h
============================================================================
$ cvs diff -u -r1.16 -r1.17 header.h
--- rpm/rpmdb/header.h 16 Jul 2007 01:32:32 -0000 1.16
+++ rpm/rpmdb/header.h 30 Jul 2007 17:34:37 -0000 1.17
@@ -230,14 +230,6 @@
/[EMAIL PROTECTED]@*/
/** \ingroup header
- * Include calculation for 8 bytes of (magic, 0)?
- */
-enum hMagic {
- HEADER_MAGIC_NO = 0,
- HEADER_MAGIC_YES = 1
-};
-
-/** \ingroup header
* The basic types of data in tags from headers.
*/
typedef enum rpmTagType_e {
@@ -398,11 +390,10 @@
/** \ingroup header
* Return size of on-disk header representation in bytes.
* @param h header
- * @param magicp include size of 8 bytes for (magic, 0)?
* @return size of on-disk header
*/
typedef
-unsigned int (*HDRsizeof) (/[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
+unsigned int (*HDRsizeof) (/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] h @*/;
/** \ingroup header
@@ -455,22 +446,20 @@
/** \ingroup header
* Read (and load) header from file handle.
* @param fd file handle
- * @param magicp read (and verify) 8 bytes of (magic, 0)?
* @return header (or NULL on error)
*/
typedef
-/[EMAIL PROTECTED]@*/ Header (*HDRread) (void * fd, enum hMagic magicp)
+/[EMAIL PROTECTED]@*/ Header (*HDRread) (void * fd)
/[EMAIL PROTECTED] fd @*/;
/** \ingroup header
* Write (with unload) header to 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
*/
typedef
-int (*HDRwrite) (void * fd, /[EMAIL PROTECTED]@*/ Header h, enum hMagic
magicp)
+int (*HDRwrite) (void * fd, /[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fd, h, fileSystem @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.143 -r1.144 rpmdb.c
--- rpm/rpmdb/rpmdb.c 30 Jul 2007 17:09:43 -0000 1.143
+++ rpm/rpmdb/rpmdb.c 30 Jul 2007 17:34:37 -0000 1.144
@@ -1812,7 +1812,7 @@
/[EMAIL PROTECTED]@*/ key->data = (void *) &mi->mi_prevoffset;
key->size = sizeof(mi->mi_prevoffset);
data->data = headerUnload(mi->mi_h);
- data->size = headerSizeof(mi->mi_h, HEADER_MAGIC_YES);
+ data->size = headerSizeof(mi->mi_h);
data->size -= 8; /* XXX HEADER_MAGIC_NO */
/* Check header digest/signature on blob export (if requested). */
@@ -3127,7 +3127,7 @@
/* XXX db0: hack to pass sizeof header to fadAlloc */
datap = h;
- datalen = headerSizeof(h, HEADER_MAGIC_YES);
+ datalen = headerSizeof(h);
datalen -= 8; /* XXX HEADER_MAGIC_NO */
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
@@ -3243,7 +3243,7 @@
/[EMAIL PROTECTED]@*/
key->size = sizeof(mi_offset.ui);
data->data = headerUnload(h);
-data->size = headerSizeof(h, HEADER_MAGIC_YES);
+data->size = headerSizeof(h);
data->size -= 8; /* XXX HEADER_MAGIC_NO */
/* Check header digest/signature on blob export. */
@@ .
rm -f rpm/tools/convertdb1.c <<'@@ .'
Index: rpm/tools/convertdb1.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
