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: 10-Nov-2007 19:06:44
Branch: HEAD Handle: 2007111018064102
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.c spec.c
rpm/lib depends.c formats.c package.c psm.c rpmchecksig.c
rpmds.c rpmfc.c rpmfi.c rpminstall.c rpmrollback.c
rpmte.c rpmts.c transaction.c
rpm/python header-py.c
rpm/rpmdb fprint.c hdrNVR.c pkgio.c rpmdb.c signature.c
Log:
- remove HGE_t casts everywhere.
Summary:
Revision Changes Path
1.1797 +1 -0 rpm/CHANGES
1.288 +3 -3 rpm/build/files.c
2.249 +4 -4 rpm/build/pack.c
2.144 +2 -2 rpm/build/parsePreamble.c
2.113 +1 -1 rpm/build/parseSpec.c
1.80 +1 -1 rpm/build/reqprov.c
2.160 +2 -2 rpm/build/spec.c
1.360 +3 -3 rpm/lib/depends.c
2.117 +1 -1 rpm/lib/formats.c
2.180 +1 -1 rpm/lib/package.c
2.259 +8 -8 rpm/lib/psm.c
1.170 +3 -3 rpm/lib/rpmchecksig.c
2.80 +3 -3 rpm/lib/rpmds.c
1.35 +1 -1 rpm/lib/rpmfc.c
2.99 +1 -1 rpm/lib/rpmfi.c
1.181 +1 -1 rpm/lib/rpminstall.c
1.25 +3 -3 rpm/lib/rpmrollback.c
2.66 +3 -3 rpm/lib/rpmte.c
2.119 +1 -1 rpm/lib/rpmts.c
1.352 +3 -3 rpm/lib/transaction.c
1.75 +3 -3 rpm/python/header-py.c
1.20 +1 -1 rpm/rpmdb/fprint.c
1.27 +3 -3 rpm/rpmdb/hdrNVR.c
1.25 +2 -2 rpm/rpmdb/pkgio.c
1.203 +6 -6 rpm/rpmdb/rpmdb.c
1.18 +1 -1 rpm/rpmdb/signature.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1796 -r1.1797 CHANGES
--- rpm/CHANGES 10 Nov 2007 15:41:26 -0000 1.1796
+++ rpm/CHANGES 10 Nov 2007 18:06:41 -0000 1.1797
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: remove HGE_t casts everywhere.
- jbj: hmmm, rpm-perl seems to have issues on BIGENDIAN non-int32 retrieves.
- jbj: use HE_t instead of individual args. dunno HGE_t et al desired ...
- jbj: eek, rpm-perl not being built here.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.287 -r1.288 files.c
--- rpm/build/files.c 9 Nov 2007 21:32:36 -0000 1.287
+++ rpm/build/files.c 10 Nov 2007 18:06:41 -0000 1.288
@@ -275,7 +275,7 @@
/*@globals internalState @*/
/*@modifies internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
uint32_t currentTime = time(NULL);
uint32_t * mtime;
@@ -2245,7 +2245,7 @@
pkg->cpioList, pkg->fileList, pkg->specialDoc, pkg->header,
rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct FileList_s fl;
char *s, **files, **fp;
@@ -2792,7 +2792,7 @@
/*@globals check_fileList @*/
/*@modifies check_fileList @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Package pkg;
int res = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.248 -r2.249 pack.c
--- rpm/build/pack.c 9 Nov 2007 21:18:43 -0000 2.248
+++ rpm/build/pack.c 10 Nov 2007 18:06:41 -0000 2.249
@@ -174,7 +174,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies h, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HRE_t hre = headerRemoveExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
@@ -468,7 +468,7 @@
void providePackageNVR(Header h)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *N, *V, *R;
@@ -594,7 +594,7 @@
int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
CSA_t csa, char *passPhrase, const char **cookie)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
FD_t fd = NULL;
@@ -939,7 +939,7 @@
/*@-boundswrite@*/
int packageBinaries(Spec spec)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct cpioSourceArchive_s csabuf;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.143 -r2.144 parsePreamble.c
--- rpm/build/parsePreamble.c 8 Nov 2007 15:15:38 -0000 2.143
+++ rpm/build/parsePreamble.c 10 Nov 2007 18:06:41 -0000 2.144
@@ -220,7 +220,7 @@
static int isMemberInEntry(Header h, const char *name, rpmTag tag)
/*@*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
@@ -468,7 +468,7 @@
spectag stashSt(Spec spec, Header h, int tag, const char * lang)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
spectag t = NULL;
int xx;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.112 -r2.113 parseSpec.c
--- rpm/build/parseSpec.c 4 Nov 2007 19:37:02 -0000 2.112
+++ rpm/build/parseSpec.c 10 Nov 2007 18:06:41 -0000 2.113
@@ -434,7 +434,7 @@
int recursing, const char *passPhrase,
const char *cookie, int anyarch, int force, int verify)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmParseState parsePart = PART_PREAMBLE;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/reqprov.c
============================================================================
$ cvs diff -u -r1.79 -r1.80 reqprov.c
--- rpm/build/reqprov.c 8 Nov 2007 15:15:38 -0000 1.79
+++ rpm/build/reqprov.c 10 Nov 2007 18:06:41 -0000 1.80
@@ -14,7 +14,7 @@
const char * N, const char * EVR, rpmsenseFlags Flags,
uint32_t index)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char ** names;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/spec.c
============================================================================
$ cvs diff -u -r2.159 -r2.160 spec.c
--- rpm/build/spec.c 3 Nov 2007 23:43:59 -0000 2.159
+++ rpm/build/spec.c 10 Nov 2007 18:06:41 -0000 2.160
@@ -67,7 +67,7 @@
/*@-boundswrite@*/
int lookupPackage(Spec spec, const char *name, int flag, /*@out@*/Package *pkg)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *fullName;
Package p;
@@ -635,7 +635,7 @@
/*@globals fileSystem @*/
/*@modifies spec->sl->sl_lines[], fileSystem @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Header h;
speclines sl = spec->sl;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.359 -r1.360 depends.c
--- rpm/lib/depends.c 9 Nov 2007 21:04:35 -0000 1.359
+++ rpm/lib/depends.c 10 Nov 2007 18:06:42 -0000 1.360
@@ -150,7 +150,7 @@
static int rpmHeadersIdentical(Header first, Header second)
/*@*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * one, * two;
int rc = 0;
@@ -190,7 +190,7 @@
int rpmtsAddInstallElement(rpmts ts, Header h,
fnpyKey key, int upgrade, rpmRelocation relocs)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmdepFlags depFlags = rpmtsDFlags(ts);
uint_32 tscolor = rpmtsColor(ts);
@@ -1324,7 +1324,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, mi, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmdepFlags depFlags = rpmtsDFlags(ts);
uint_32 tscolor = rpmtsColor(ts);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/formats.c
============================================================================
$ cvs diff -u -r2.116 -r2.117 formats.c
--- rpm/lib/formats.c 8 Nov 2007 15:15:39 -0000 2.116
+++ rpm/lib/formats.c 10 Nov 2007 18:06:42 -0000 2.117
@@ -54,7 +54,7 @@
/*@modifies he, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
rpmTagData fnames = { .ptr = NULL };
rpmTagData fsizes = { .ptr = NULL };
rpmTagData p;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.179 -r2.180 package.c
--- rpm/lib/package.c 9 Nov 2007 21:32:37 -0000 2.179
+++ rpm/lib/package.c 10 Nov 2007 18:06:42 -0000 2.180
@@ -183,7 +183,7 @@
/*@-mods@*/
rpmRC rpmReadPackageFile(rpmts ts, void * _fd, const char * fn, Header * hdrp)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
HE_t she = memset(alloca(sizeof(*she)), 0, sizeof(*she));
pgpDig dig = rpmtsDig(ts);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.258 -r2.259 psm.c
--- rpm/lib/psm.c 9 Nov 2007 21:32:37 -0000 2.258
+++ rpm/lib/psm.c 10 Nov 2007 18:06:42 -0000 2.259
@@ -56,7 +56,7 @@
int rpmVersionCompare(Header first, Header second)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * one, * two;
uint32_t Eone, Etwo;
@@ -185,7 +185,7 @@
rpmRC rpmInstallSourcePackage(rpmts ts, void * _fd,
const char ** specFilePtr, const char ** cookie)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
FD_t fd = _fd;
int scareMem = 0;
@@ -492,7 +492,7 @@
/*@globals h_errno, fileSystem, internalState @*/
/*@modifies psm, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const rpmts ts = psm->ts;
int rootFdno = -1;
@@ -625,7 +625,7 @@
/*@modifies psm, ldconfig_done, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const rpmts ts = psm->ts;
const char ** argv = NULL;
@@ -952,7 +952,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmfi fi = psm->fi;
const char * argv0 = NULL;
@@ -1014,7 +1014,7 @@
rpmGlobalMacroContext, fileSystem, internalState @*/
{
int scareMem = 0;
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const rpmts ts = psm->ts;
rpmds trigger = NULL;
@@ -1164,7 +1164,7 @@
/*@modifies psm, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const rpmts ts = psm->ts;
rpmfi fi = psm->fi;
@@ -1348,7 +1348,7 @@
static uint32_t hLoadTID(Header h, rpmTag tag)
/*@*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
uint32_t val;
int xx;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.169 -r1.170 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 9 Nov 2007 21:04:35 -0000 1.169
+++ rpm/lib/rpmchecksig.c 10 Nov 2007 18:06:42 -0000 1.170
@@ -142,7 +142,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies *signid, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int rc = 1;
int xx;
@@ -756,7 +756,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies fd, *dig, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
unsigned char buf[4*BUFSIZ];
ssize_t count;
@@ -843,7 +843,7 @@
int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
const char * fn)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
HE_t she = memset(alloca(sizeof(*she)), 0, sizeof(*she));
int res2, res3;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.79 -r2.80 rpmds.c
--- rpm/lib/rpmds.c 9 Nov 2007 21:59:44 -0000 2.79
+++ rpm/lib/rpmds.c 10 Nov 2007 18:06:42 -0000 2.80
@@ -235,7 +235,7 @@
rpmds rpmdsNew(Header h, rpmTag tagN, int flags)
{
int scareMem = (flags & 0x1);
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmTag tagEVR, tagF;
@@ -472,7 +472,7 @@
rpmds rpmdsThis(Header h, rpmTag tagN, evrFlags Flags)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmds ds = NULL;
const char * Type;
@@ -3708,7 +3708,7 @@
int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * pkgN, * V, * R;
uint32_t E;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.34 -r1.35 rpmfc.c
--- rpm/lib/rpmfc.c 9 Nov 2007 21:59:44 -0000 1.34
+++ rpm/lib/rpmfc.c 10 Nov 2007 18:06:42 -0000 1.35
@@ -1323,7 +1323,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
StringBuf sb_stdin = newStringBuf();
StringBuf sb_stdout = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.98 -r2.99 rpmfi.c
--- rpm/lib/rpmfi.c 9 Nov 2007 23:18:02 -0000 2.98
+++ rpm/lib/rpmfi.c 10 Nov 2007 18:06:42 -0000 2.99
@@ -1274,7 +1274,7 @@
rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, int flags)
{
int scareMem = (flags & 0x1);
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmte p;
rpmfi fi = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.180 -r1.181 rpminstall.c
--- rpm/lib/rpminstall.c 9 Nov 2007 20:11:00 -0000 1.180
+++ rpm/lib/rpminstall.c 10 Nov 2007 18:06:42 -0000 1.181
@@ -306,7 +306,7 @@
/** @todo Generalize --freshen policies. */
int rpmcliInstall(rpmts ts, QVA_t ia, const char ** argv)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
ARGV_t avfn = NULL;
int acfn = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpmrollback.c
--- rpm/lib/rpmrollback.c 3 Nov 2007 23:44:01 -0000 1.24
+++ rpm/lib/rpmrollback.c 10 Nov 2007 18:06:42 -0000 1.25
@@ -90,7 +90,7 @@
IDTX IDTXload(rpmts ts, rpmTag tag, uint32_t rbtid)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
IDTX idtx = NULL;
rpmdbMatchIterator mi;
@@ -140,7 +140,7 @@
IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag, uint32_t rbtid)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
IDTX idtx = NULL;
Header h;
@@ -286,7 +286,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, p, ip, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int rc = 0;
int xx;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.65 -r2.66 rpmte.c
--- rpm/lib/rpmte.c 8 Nov 2007 20:26:17 -0000 2.65
+++ rpm/lib/rpmte.c 10 Nov 2007 18:06:42 -0000 2.66
@@ -93,7 +93,7 @@
rpmGlobalMacroContext, fileSystem, internalState @*/
{
int scareMem = 0;
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
@@ -212,7 +212,7 @@
int dboffset,
alKey pkgKey)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmte p = xcalloc(1, sizeof(*p));
int xx;
@@ -596,7 +596,7 @@
int rpmteChain(rpmte p, rpmte q, Header oh, const char * msg)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * blinkNEVRA = NULL;
const char * blinkPkgid = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.118 -r2.119 rpmts.c
--- rpm/lib/rpmts.c 4 Nov 2007 11:09:28 -0000 2.118
+++ rpm/lib/rpmts.c 10 Nov 2007 18:06:42 -0000 2.119
@@ -307,7 +307,7 @@
int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * errstr;
const char * str = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.351 -r1.352 transaction.c
--- rpm/lib/transaction.c 9 Nov 2007 21:32:37 -0000 1.351
+++ rpm/lib/transaction.c 10 Nov 2007 18:06:42 -0000 1.352
@@ -89,7 +89,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, p, fi, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * altNVRA = NULL;
uint_32 tscolor = rpmtsColor(ts);
@@ -235,7 +235,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies ts, fi, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Header h;
const unsigned char * otherStates;
@@ -599,7 +599,7 @@
const rpmte p, const Header h)
/*@modifies ts @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int_32 reqFlags = (RPMSENSE_LESS | RPMSENSE_EQUAL);
const char * reqEVR;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.74 -r1.75 header-py.c
--- rpm/python/header-py.c 9 Nov 2007 21:32:38 -0000 1.74
+++ rpm/python/header-py.c 10 Nov 2007 18:06:43 -0000 1.75
@@ -317,7 +317,7 @@
static void mungeFilelist(Header h)
/*@*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
@@ -349,7 +349,7 @@
*/
static void providePackageNVR(Header h)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *N, *V, *R;
@@ -726,7 +726,7 @@
static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
/*@*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int_32 tag = -1;
int i;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 fprint.c
--- rpm/rpmdb/fprint.c 17 Oct 2007 18:32:57 -0000 1.19
+++ rpm/rpmdb/fprint.c 10 Nov 2007 18:06:43 -0000 1.20
@@ -248,7 +248,7 @@
void fpLookupHeader(fingerPrintCache cache, Header h, fingerPrint * fpList)
/*@modifies h, cache, *fpList @*/;
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
rpmTagData he_p = { .ptr = NULL };
HE_s he_s = { .tag = 0, .t = 0, .p = &he_p, .c = 0, .freeData = 0 };
HE_t he = &he_s;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.26 -r1.27 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 9 Nov 2007 22:20:51 -0000 1.26
+++ rpm/rpmdb/hdrNVR.c 10 Nov 2007 18:06:43 -0000 1.27
@@ -35,7 +35,7 @@
/*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct tagMacro * tagm;
char numbuf[64];
@@ -107,7 +107,7 @@
/*@globals rpmGlobalMacroContext @*/
/*@modifies rpmGlobalMacroContext @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
struct tagMacro * tagm;
int xx;
@@ -202,7 +202,7 @@
uint_32 hGetColor(Header h)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
uint_32 hcolor = 0;
int xx;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.24 -r1.25 pkgio.c
--- rpm/rpmdb/pkgio.c 9 Nov 2007 22:20:51 -0000 1.24
+++ rpm/rpmdb/pkgio.c 10 Nov 2007 18:06:43 -0000 1.25
@@ -73,7 +73,7 @@
rpmRC rpmtsFindPubkey(rpmts ts, void * _dig)
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
pgpDig dig = (_dig ? _dig : rpmtsDig(ts));
const void * sig = pgpGetSig(dig);
@@ -533,7 +533,7 @@
/*@globals fileSystem @*/
/*@modifies *ptr, *msg, fileSystem @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Header * sighp = ptr;
char buf[BUFSIZ];
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.202 -r1.203 rpmdb.c
--- rpm/rpmdb/rpmdb.c 9 Nov 2007 21:04:36 -0000 1.202
+++ rpm/rpmdb/rpmdb.c 10 Nov 2007 18:06:43 -0000 1.203
@@ -860,7 +860,7 @@
/*@modifies rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * fn = NULL;
int xx;
@@ -1406,7 +1406,7 @@
fileSystem, internalState @*/
/*@requires maxSet(matches) >= 0 @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * dirName;
const char * baseName;
@@ -2146,7 +2146,7 @@
static int mireSkip (const rpmdbMatchIterator mi)
/*@modifies mi->mi_re @*/
{
- HGE_t hge = (HGE_t) headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
char numbuf[32];
miRE mire;
@@ -2787,9 +2787,9 @@
DBT * key = alloca(sizeof(*key));
DBT * data = alloca(sizeof(*data));
union _dbswap mi_offset;
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
#ifdef DYING
- HAE_t hae = (HAE_t)headerAddExtension;
+ HAE_t hae = headerAddExtension;
#endif
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Header h;
@@ -3590,7 +3590,7 @@
{
DBT * key;
DBT * data;
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmdbMatchIterator mi;
fingerPrintCache fpc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.17 -r1.18 signature.c
--- rpm/rpmdb/signature.c 9 Nov 2007 22:20:51 -0000 1.17
+++ rpm/rpmdb/signature.c 10 Nov 2007 18:06:43 -0000 1.18
@@ -523,7 +523,7 @@
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies sigh, sigTag, rpmGlobalMacroContext, fileSystem, internalState @*/
{
- HGE_t hge = (HGE_t)headerGetExtension;
+ HGE_t hge = headerGetExtension;
HAE_t hae = headerAddExtension;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
Header h = NULL;
@@ .
Received on Sat Nov 10 19:06:44 2007