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: 17-Oct-2007 03:45:50
Branch: HEAD Handle: 2007101702454505
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.c
rpm/lib depends.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 spec-py.c
rpm/rpmdb header.h rpmdb.c
rpm/tools rpmcache.c
Log:
- start regularizing hae/hme calls.
- drill rpmTagCount everywhere.
Summary:
Revision Changes Path
1.1721 +2 -0 rpm/CHANGES
1.272 +19 -9 rpm/build/files.c
2.236 +3 -3 rpm/build/pack.c
2.134 +3 -3 rpm/build/parsePreamble.c
2.107 +1 -1 rpm/build/parseSpec.c
1.72 +1 -1 rpm/build/reqprov.c
1.350 +3 -3 rpm/lib/depends.c
2.173 +1 -1 rpm/lib/package.c
2.244 +32 -20 rpm/lib/psm.c
1.157 +4 -4 rpm/lib/rpmchecksig.c
2.72 +3 -3 rpm/lib/rpmds.c
1.24 +1 -1 rpm/lib/rpmfc.c
2.88 +37 -20 rpm/lib/rpmfi.c
1.174 +1 -1 rpm/lib/rpminstall.c
1.19 +3 -3 rpm/lib/rpmrollback.c
2.59 +3 -3 rpm/lib/rpmte.c
2.110 +1 -1 rpm/lib/rpmts.c
1.343 +3 -3 rpm/lib/transaction.c
1.63 +8 -8 rpm/python/header-py.c
1.7 +2 -2 rpm/python/spec-py.c
1.38 +3 -3 rpm/rpmdb/header.h
1.188 +2 -2 rpm/rpmdb/rpmdb.c
2.18 +2 -2 rpm/tools/rpmcache.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1720 -r1.1721 CHANGES
--- rpm/CHANGES 17 Oct 2007 00:32:26 -0000 1.1720
+++ rpm/CHANGES 17 Oct 2007 01:45:45 -0000 1.1721
@@ -1,4 +1,6 @@
4.5 -> 5.0:
+ - jbj: start regularizing hae/hme calls.
+ - jbj: drill rpmTagCount everywhere.
- jbj: change hPTR_t to hRET_t in ABI, revert to const void * in API.
- jbj: drill hPTR_t through prototypes. hRET_t * refactor next.
- jbj: drill rpmTagCount through rpmdb/* files.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.271 -r1.272 files.c
--- rpm/build/files.c 14 Oct 2007 22:53:56 -0000 1.271
+++ rpm/build/files.c 17 Oct 2007 01:45:45 -0000 1.272
@@ -273,7 +273,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int_32 currentTime = time(NULL);
@@ -1172,7 +1172,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
HAE_t hae = (HAE_t)headerAddEntry;
@@ -1254,11 +1254,21 @@
exit:
if (count > 0) {
- xx = hae(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE, dirIndexes, count);
- xx = hae(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
- baseNames, count);
- xx = hae(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
- dirNames, dirIndex + 1);
+ he->tag = RPMTAG_DIRINDEXES;
+ he_t = RPM_INT32_TYPE;
+ he_p.i32p = dirIndexes;
+ he_c = count;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
+ he->tag = RPMTAG_BASENAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = baseNames;
+ he_c = count;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
+ he->tag = RPMTAG_DIRNAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = dirNames;
+ he_c = dirIndex + 1;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
}
fileNames = _free(fileNames);
@@ -2157,7 +2167,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
struct FileList_s fl;
@@ -2687,7 +2697,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
Package pkg;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.235 -r2.236 pack.c
--- rpm/build/pack.c 14 Oct 2007 22:53:56 -0000 2.235
+++ rpm/build/pack.c 17 Oct 2007 01:45:45 -0000 2.236
@@ -176,7 +176,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
StringBuf sb = newStringBuf();
@@ -442,7 +442,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char *N, *V, *R;
@@ -865,7 +865,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
struct cpioSourceArchive_s csabuf;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.133 -r2.134 parsePreamble.c
--- rpm/build/parsePreamble.c 14 Oct 2007 22:53:56 -0000 2.133
+++ rpm/build/parsePreamble.c 17 Oct 2007 01:45:45 -0000 2.134
@@ -214,7 +214,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int xx;
@@ -445,7 +445,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
spectag t = NULL;
@@ -506,7 +506,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
char * field = spec->line;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.106 -r2.107 parseSpec.c
--- rpm/build/parseSpec.c 14 Oct 2007 22:53:56 -0000 2.106
+++ rpm/build/parseSpec.c 17 Oct 2007 01:45:45 -0000 2.107
@@ -437,7 +437,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmParseState parsePart = PART_PREAMBLE;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/reqprov.c
============================================================================
$ cvs diff -u -r1.71 -r1.72 reqprov.c
--- rpm/build/reqprov.c 14 Oct 2007 22:53:56 -0000 1.71
+++ rpm/build/reqprov.c 17 Oct 2007 01:45:45 -0000 1.72
@@ -17,7 +17,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char ** names;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.349 -r1.350 depends.c
--- rpm/lib/depends.c 15 Oct 2007 12:08:48 -0000 1.349
+++ rpm/lib/depends.c 17 Oct 2007 01:45:46 -0000 1.350
@@ -153,7 +153,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * one, * two;
@@ -197,7 +197,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmdepFlags depFlags = rpmtsDFlags(ts);
@@ -1318,7 +1318,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmdepFlags depFlags = rpmtsDFlags(ts);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.172 -r2.173 package.c
--- rpm/lib/package.c 14 Oct 2007 22:53:57 -0000 2.172
+++ rpm/lib/package.c 17 Oct 2007 01:45:46 -0000 2.173
@@ -187,7 +187,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
pgpDig dig = rpmtsDig(ts);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.243 -r2.244 psm.c
--- rpm/lib/psm.c 16 Oct 2007 15:59:08 -0000 2.243
+++ rpm/lib/psm.c 17 Oct 2007 01:45:46 -0000 2.244
@@ -58,7 +58,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * one, * two;
@@ -191,7 +191,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
FD_t fd = _fd;
@@ -501,7 +501,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const rpmts ts = psm->ts;
@@ -638,7 +638,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const rpmts ts = psm->ts;
@@ -969,7 +969,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmfi fi = psm->fi;
@@ -1035,7 +1035,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const rpmts ts = psm->ts;
@@ -1189,7 +1189,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const rpmts ts = psm->ts;
@@ -1371,13 +1371,13 @@
* @param tag tag to load
* @return tag value (0 on failure)
*/
-static uint_32 hLoadTID(Header h, int_32 tag)
+static uint_32 hLoadTID(Header h, rpmTag tag)
/*@*/
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
uint_32 val;
@@ -1397,13 +1397,13 @@
* @param tag tag to copy
* @return 0 always
*/
-static int hCopyTag(Header sh, Header th, int_32 tag)
+static int hCopyTag(Header sh, Header th, rpmTag tag)
/*@modifies th @*/
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int xx = 1;
@@ -1598,7 +1598,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const rpmts ts = psm->ts;
@@ -1856,8 +1856,8 @@
HeaderIterator hi;
int_32 tag;
rpmTagType type;
- int_32 count;
- hPTR_t ptr;
+ const void * ptr;
+ rpmTagCount count;
Header oh;
/* Load the original header from the blob. */
@@ -1868,11 +1868,17 @@
for (hi = headerInitIterator(oh);
headerNextIterator(hi, &tag, &type, &ptr, &count);
- ptr = headerFreeData((void *)ptr, type))
+ ptr = headerFreeData(ptr, type))
{
if (tag == RPMTAG_ARCHIVESIZE)
noArchiveSize = 1;
- if (ptr) xx = hae(psm->oh, tag, type, ptr, count);
+ if (ptr) {
+ he->tag = tag;
+ he_t = type;
+ he_p.ptr = (void *) ptr; /* NOCAST */
+ he_c = count;
+ xx = hae(psm->oh, he->tag, he_t, he_p, he_c);
+ }
}
hi = headerFreeIterator(hi);
@@ -1931,13 +1937,19 @@
if (psm->oh != NULL)
{ int_32 tid = rpmtsGetTid(ts);
- xx = hae(psm->oh, RPMTAG_REMOVETID, RPM_INT32_TYPE,
- &tid, 1);
+ he->tag = RPMTAG_REMOVETID;
+ he_t = RPM_INT32_TYPE;
+ he_p.i32p = &tid;
+ he_c = 1;
+ xx = hae(psm->oh, he->tag, he_t, he_p, he_c);
/* Add original header's origin (i.e. URL) */
if (origin != NULL) {
- xx = hae(psm->oh, RPMTAG_PACKAGEORIGIN, RPM_STRING_TYPE,
- origin, 1);
+ he->tag = RPMTAG_PACKAGEORIGIN;
+ he_t = RPM_STRING_TYPE;
+ he_p.str = origin;
+ he_c = 1;
+ xx = hae(psm->oh, he->tag, he_t, he_p, he_c);
origin = _free(origin);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.156 -r1.157 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 14 Oct 2007 22:53:57 -0000 1.156
+++ rpm/lib/rpmchecksig.c 17 Oct 2007 01:45:47 -0000 1.157
@@ -145,7 +145,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int rc = 1;
@@ -184,7 +184,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmgi gi = NULL;
@@ -679,7 +679,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
unsigned char buf[4*BUFSIZ];
@@ -770,7 +770,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int res2, res3;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.71 -r2.72 rpmds.c
--- rpm/lib/rpmds.c 14 Oct 2007 22:53:57 -0000 2.71
+++ rpm/lib/rpmds.c 17 Oct 2007 01:45:47 -0000 2.72
@@ -238,7 +238,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
@@ -479,7 +479,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmds ds = NULL;
@@ -3719,7 +3719,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * pkgN, * V, * R;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpmfc.c
--- rpm/lib/rpmfc.c 14 Oct 2007 22:53:57 -0000 1.23
+++ rpm/lib/rpmfc.c 17 Oct 2007 01:45:47 -0000 1.24
@@ -1324,7 +1324,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
StringBuf sb_stdin = newStringBuf();
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.87 -r2.88 rpmfi.c
--- rpm/lib/rpmfi.c 16 Oct 2007 16:07:28 -0000 2.87
+++ rpm/lib/rpmfi.c 17 Oct 2007 01:45:47 -0000 2.88
@@ -688,7 +688,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
HAE_t hae = (HAE_t) headerAddEntry;
@@ -744,9 +744,13 @@
*/
if (p->relocs == NULL || numRelocations == 0) {
if (numValid) {
- if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES))
- xx = hae(origH, RPMTAG_INSTPREFIXES,
- validType, validRelocations, numValid);
+ if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES)) {
+ he->tag = RPMTAG_INSTPREFIXES;
+ he_t = validType;
+ he_p.argv = validRelocations;
+ he_c = numValid;
+ xx = hae(origH, he->tag, he_t, he_p, he_c);
+ }
validRelocations = _free(validRelocations);
}
/* XXX FIXME multilib file actions need to be checked. */
@@ -868,9 +872,13 @@
}
}
- if (numActual)
- xx = hae(h, RPMTAG_INSTPREFIXES, RPM_STRING_ARRAY_TYPE,
- (void **) actualRelocations, numActual);
+ if (numActual) {
+ he->tag = RPMTAG_INSTPREFIXES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = actualRelocations;
+ he_c = numActual;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
+ }
actualRelocations = _free(actualRelocations);
validRelocations = _free(validRelocations);
@@ -1097,39 +1105,48 @@
if (nrelocated) {
he->tag = RPMTAG_BASENAMES;
xx = hge(h, he->tag, he->t, he->p, he->c);
- xx = hae(h, RPMTAG_ORIGBASENAMES, he_t, he_p.ptr, he_c);
+ he->tag = RPMTAG_ORIGBASENAMES;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
he_p.ptr = _free(he_p.ptr);
he->tag = RPMTAG_DIRNAMES;
xx = hge(h, he->tag, he->t, he->p, he->c);
- xx = hae(h, RPMTAG_ORIGDIRNAMES, he_t, he_p.ptr, he_c);
+ he->tag = RPMTAG_ORIGDIRNAMES;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
he_p.ptr = _free(he_p.ptr);
he->tag = RPMTAG_DIRINDEXES;
xx = hge(h, he->tag, he->t, he->p, he->c);
- xx = hae(h, RPMTAG_ORIGDIRINDEXES, he_t, he_p.ptr, he_c);
+ he->tag = RPMTAG_ORIGDIRINDEXES;
+ xx = hae(h, he->tag, he_t, he_p, he_c);
he_p.ptr = _free(he_p.ptr);
- xx = hme(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
- baseNames, fileCount);
- fi->bnl = _free(fi->bnl);
he->tag = RPMTAG_BASENAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = baseNames;
+ he_c = fileCount;
+ xx = hme(h, he->tag, he_t, he_p, he_c);
+ fi->bnl = _free(fi->bnl);
xx = hge(h, he->tag, he->t, he->p, he->c);
fi->bnl = he_p.argv;
fi->fc = he_c;
- xx = hme(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
- dirNames, dirCount);
- fi->dnl = _free(fi->dnl);
he->tag = RPMTAG_DIRNAMES;
+ he_t = RPM_STRING_ARRAY_TYPE;
+ he_p.argv = dirNames;
+ he_c = dirCount;
+ xx = hme(h, he->tag, he_t, he_p, he_c);
+ fi->dnl = _free(fi->dnl);
xx = hge(h, he->tag, he->t, he->p, he->c);
fi->dnl = he_p.argv;
fi->dc = he_c;
- xx = hme(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
- dirIndexes, fileCount);
- fi->dil = _free(fi->dil);
he->tag = RPMTAG_DIRINDEXES;
+ he_t = RPM_INT32_TYPE;
+ he_p.i32p = dirIndexes;
+ he_c = fileCount;
+ xx = hme(h, he->tag, he_t, he_p, he_c);
+ fi->dil = _free(fi->dil);
xx = hge(h, he->tag, he->t, he->p, he->c);
fi->dil = he_p.ui32p;
}
@@ -1263,7 +1280,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmte p;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.173 -r1.174 rpminstall.c
--- rpm/lib/rpminstall.c 14 Oct 2007 22:53:57 -0000 1.173
+++ rpm/lib/rpminstall.c 17 Oct 2007 01:45:47 -0000 1.174
@@ -309,7 +309,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int numFailed = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.18 -r1.19 rpmrollback.c
--- rpm/lib/rpmrollback.c 14 Oct 2007 22:53:57 -0000 1.18
+++ rpm/lib/rpmrollback.c 17 Oct 2007 01:45:47 -0000 1.19
@@ -93,7 +93,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
IDTX idtx = NULL;
@@ -147,7 +147,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
IDTX idtx = NULL;
@@ -297,7 +297,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int rc = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.58 -r2.59 rpmte.c
--- rpm/lib/rpmte.c 14 Oct 2007 22:53:57 -0000 2.58
+++ rpm/lib/rpmte.c 17 Oct 2007 01:45:47 -0000 2.59
@@ -98,7 +98,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int xx;
@@ -221,7 +221,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
rpmte p = xcalloc(1, sizeof(*p));
@@ -609,7 +609,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * blinkNEVRA = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.109 -r2.110 rpmts.c
--- rpm/lib/rpmts.c 14 Oct 2007 22:53:57 -0000 2.109
+++ rpm/lib/rpmts.c 17 Oct 2007 01:45:47 -0000 2.110
@@ -307,7 +307,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * errstr;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.342 -r1.343 transaction.c
--- rpm/lib/transaction.c 14 Oct 2007 22:53:57 -0000 1.342
+++ rpm/lib/transaction.c 17 Oct 2007 01:45:47 -0000 1.343
@@ -103,7 +103,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char * altNVRA = NULL;
@@ -253,7 +253,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
Header h;
@@ -621,7 +621,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int_32 reqFlags = (RPMSENSE_LESS | RPMSENSE_EQUAL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.62 -r1.63 header-py.c
--- rpm/python/header-py.c 15 Oct 2007 05:59:54 -0000 1.62
+++ rpm/python/header-py.c 17 Oct 2007 01:45:49 -0000 1.63
@@ -175,7 +175,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
HAE_t hae = (HAE_t)headerAddEntry;
@@ -209,7 +209,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
HAE_t hae = (HAE_t)headerAddEntry;
@@ -311,7 +311,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int xx;
@@ -345,7 +345,7 @@
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
const char *N, *V, *R;
@@ -707,14 +707,14 @@
* @retval c address of number of values
* @return 0 on success, 1 on bad magic, 2 on error
*/
-static int rpmHeaderGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type,
- /*@out@*/ void **p, /*@out@*/ int_32 *c)
+static int rpmHeaderGetEntry(Header h, rpmTag tag, /*@out@*/ rpmTagType *type,
+ /*@out@*/ void **p, /*@out@*/ rpmTagCount *c)
/*@modifies *type, *p, *c @*/
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int xx;
@@ -770,7 +770,7 @@
{
rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int_32 tag = -1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/spec-py.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 spec-py.c
--- rpm/python/spec-py.c 20 Jul 2007 22:47:34 -0000 1.6
+++ rpm/python/spec-py.c 17 Oct 2007 01:45:49 -0000 1.7
@@ -133,7 +133,7 @@
struct Source * source;
PyObject *sourceList, *srcUrl;
Spec spec;
- char * fullSource;
+ const char * fullSource;
sourceList = PyList_New(0);
spec = specFromSpec(s);
@@ -144,7 +144,7 @@
fullSource = source->fullSource;
srcUrl = Py_BuildValue("(sii)", fullSource, source->num, source->flags);
PyList_Append(sourceList, srcUrl);
- source=source->next;
+ source = source->next;
}
return PyList_AsTuple(sourceList);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.h
============================================================================
$ cvs diff -u -r1.37 -r1.38 header.h
--- rpm/rpmdb/header.h 17 Oct 2007 00:32:26 -0000 1.37
+++ rpm/rpmdb/header.h 17 Oct 2007 01:45:49 -0000 1.38
@@ -234,7 +234,7 @@
* @return formatted string
*/
typedef /*only@*/ char * (*headerTagFormatFunction)(rpmTagType type,
- hPTR_t data, char * formatPrefix,
+ rpmTagData * data, char * formatPrefix,
int padding, int element)
/*@requires maxSet(data) >= 0 @*/;
@@ -400,7 +400,7 @@
* @return 1 on success, 0 on failure
*/
typedef int (*HAE_t) (Header h, rpmTag tag, rpmTagType type,
- hPTR_t p, rpmTagCount c)
+ rpmTagData p, rpmTagCount c)
/*@modifies h @*/;
/**
@@ -415,7 +415,7 @@
* @return 1 on success, 0 on failure
*/
typedef int (*HME_t) (Header h, rpmTag tag, rpmTagType type,
- hPTR_t p, rpmTagCount c)
+ rpmTagData p, rpmTagCount c)
/*@modifies h @*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.187 -r1.188 rpmdb.c
--- rpm/rpmdb/rpmdb.c 17 Oct 2007 00:32:26 -0000 1.187
+++ rpm/rpmdb/rpmdb.c 17 Oct 2007 01:45:49 -0000 1.188
@@ -3140,7 +3140,7 @@
he_p.i32p = &tid;
he_c = 1;
if (!headerIsEntry(h, he->tag))
- xx = hae(h, he->tag, he_t, &he_p, he_c);
+ xx = hae(h, he->tag, he_t, he_p, he_c);
}
/* Add the package color if not present. */
@@ -3150,7 +3150,7 @@
he_t = RPM_INT32_TYPE;
he_p.ui32p = &hcolor;
he_c = 1;
- xx = hae(h, he->tag, he_t, &he_p, he_c);
+ xx = hae(h, he->tag, he_t, he_p, he_c);
}
#if defined(SUPPORT_RPMV3_BASENAMES_HACKS)
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmcache.c
============================================================================
$ cvs diff -u -r2.17 -r2.18 rpmcache.c
--- rpm/tools/rpmcache.c 14 Oct 2007 18:50:25 -0000 2.17
+++ rpm/tools/rpmcache.c 17 Oct 2007 01:45:50 -0000 2.18
@@ -106,9 +106,9 @@
static int ftsCacheUpdate(rpmts ts)
{
HGE_t hge = (HGE_t)headerGetExtension;
- int_32 he_t = 0;
+ rpmTagType he_t = 0;
hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagCount he_c = 0;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
int_32 tid = rpmtsGetTid(ts);
@@ .
Received on Wed Oct 17 03:45:50 2007