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 18:53:24
Branch: HEAD Handle: 2007101717532103
Modified files:
rpm CHANGES
rpm/build files.c pack.c parsePreamble.c parseSpec.c
reqprov.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 hdrfmt.c header.h pkgio.c
rpmdb.c signature.c
Log:
- jbj: drill rpmTagData everywhere.
Summary:
Revision Changes Path
1.1722 +1 -0 rpm/CHANGES
1.273 +4 -4 rpm/build/files.c
2.237 +3 -3 rpm/build/pack.c
2.135 +3 -3 rpm/build/parsePreamble.c
2.108 +1 -1 rpm/build/parseSpec.c
1.73 +1 -1 rpm/build/reqprov.c
1.351 +3 -3 rpm/lib/depends.c
2.112 +2 -2 rpm/lib/formats.c
2.174 +1 -1 rpm/lib/package.c
2.245 +10 -10 rpm/lib/psm.c
1.158 +4 -4 rpm/lib/rpmchecksig.c
2.73 +3 -3 rpm/lib/rpmds.c
1.25 +1 -1 rpm/lib/rpmfc.c
2.89 +2 -2 rpm/lib/rpmfi.c
1.175 +1 -1 rpm/lib/rpminstall.c
1.20 +3 -3 rpm/lib/rpmrollback.c
2.60 +3 -3 rpm/lib/rpmte.c
2.111 +1 -1 rpm/lib/rpmts.c
1.344 +3 -3 rpm/lib/transaction.c
1.64 +7 -7 rpm/python/header-py.c
1.18 +2 -2 rpm/rpmdb/fprint.c
1.17 +6 -6 rpm/rpmdb/hdrNVR.c
1.14 +12 -11 rpm/rpmdb/hdrfmt.c
1.39 +1 -1 rpm/rpmdb/header.h
1.18 +4 -4 rpm/rpmdb/pkgio.c
1.189 +13 -13 rpm/rpmdb/rpmdb.c
1.11 +2 -2 rpm/rpmdb/signature.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1721 -r1.1722 CHANGES
--- rpm/CHANGES 17 Oct 2007 01:45:45 -0000 1.1721
+++ rpm/CHANGES 17 Oct 2007 16:53:21 -0000 1.1722
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: drill rpmTagData everywhere.
- 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.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.272 -r1.273 files.c
--- rpm/build/files.c 17 Oct 2007 01:45:45 -0000 1.272
+++ rpm/build/files.c 17 Oct 2007 16:53:22 -0000 1.273
@@ -272,7 +272,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1171,7 +1171,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -2166,7 +2166,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -2696,7 +2696,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.236 -r2.237 pack.c
--- rpm/build/pack.c 17 Oct 2007 01:45:45 -0000 2.236
+++ rpm/build/pack.c 17 Oct 2007 16:53:22 -0000 2.237
@@ -175,7 +175,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -441,7 +441,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -864,7 +864,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.134 -r2.135 parsePreamble.c
--- rpm/build/parsePreamble.c 17 Oct 2007 01:45:45 -0000 2.134
+++ rpm/build/parsePreamble.c 17 Oct 2007 16:53:22 -0000 2.135
@@ -213,7 +213,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -444,7 +444,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -505,7 +505,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseSpec.c
============================================================================
$ cvs diff -u -r2.107 -r2.108 parseSpec.c
--- rpm/build/parseSpec.c 17 Oct 2007 01:45:45 -0000 2.107
+++ rpm/build/parseSpec.c 17 Oct 2007 16:53:22 -0000 2.108
@@ -436,7 +436,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/reqprov.c
============================================================================
$ cvs diff -u -r1.72 -r1.73 reqprov.c
--- rpm/build/reqprov.c 17 Oct 2007 01:45:45 -0000 1.72
+++ rpm/build/reqprov.c 17 Oct 2007 16:53:22 -0000 1.73
@@ -16,7 +16,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.350 -r1.351 depends.c
--- rpm/lib/depends.c 17 Oct 2007 01:45:46 -0000 1.350
+++ rpm/lib/depends.c 17 Oct 2007 16:53:22 -0000 1.351
@@ -152,7 +152,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -196,7 +196,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1317,7 +1317,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/formats.c
============================================================================
$ cvs diff -u -r2.111 -r2.112 formats.c
--- rpm/lib/formats.c 14 Oct 2007 22:53:57 -0000 2.111
+++ rpm/lib/formats.c 17 Oct 2007 16:53:22 -0000 2.112
@@ -55,8 +55,8 @@
fileSystem, internalState @*/
{
HGE_t hge = (HGE_t)headerGetExtension;
- hRET_t fnames = { .ptr = NULL };
- hRET_t fsizes = { .ptr = NULL };
+ rpmTagData fnames = { .ptr = NULL };
+ rpmTagData fsizes = { .ptr = NULL };
uint_64 * usages;
int numFiles;
int rc = 1; /* assume error */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.173 -r2.174 package.c
--- rpm/lib/package.c 17 Oct 2007 01:45:46 -0000 2.173
+++ rpm/lib/package.c 17 Oct 2007 16:53:22 -0000 2.174
@@ -186,7 +186,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.244 -r2.245 psm.c
--- rpm/lib/psm.c 17 Oct 2007 01:45:46 -0000 2.244
+++ rpm/lib/psm.c 17 Oct 2007 16:53:22 -0000 2.245
@@ -57,7 +57,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -190,7 +190,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -500,7 +500,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -637,7 +637,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -968,7 +968,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1034,7 +1034,7 @@
int scareMem = 0;
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1188,7 +1188,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1376,7 +1376,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1402,7 +1402,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1597,7 +1597,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.157 -r1.158 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 17 Oct 2007 01:45:47 -0000 1.157
+++ rpm/lib/rpmchecksig.c 17 Oct 2007 16:53:22 -0000 1.158
@@ -144,7 +144,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -183,7 +183,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -678,7 +678,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -769,7 +769,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.72 -r2.73 rpmds.c
--- rpm/lib/rpmds.c 17 Oct 2007 01:45:47 -0000 2.72
+++ rpm/lib/rpmds.c 17 Oct 2007 16:53:22 -0000 2.73
@@ -237,7 +237,7 @@
int scareMem = (flags & 0x1);
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -478,7 +478,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -3718,7 +3718,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpmfc.c
--- rpm/lib/rpmfc.c 17 Oct 2007 01:45:47 -0000 1.24
+++ rpm/lib/rpmfc.c 17 Oct 2007 16:53:22 -0000 1.25
@@ -1323,7 +1323,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.88 -r2.89 rpmfi.c
--- rpm/lib/rpmfi.c 17 Oct 2007 01:45:47 -0000 2.88
+++ rpm/lib/rpmfi.c 17 Oct 2007 16:53:22 -0000 2.89
@@ -687,7 +687,7 @@
rpmte p = rpmtsRelocateElement(ts);
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -1279,7 +1279,7 @@
int scareMem = (flags & 0x1);
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.174 -r1.175 rpminstall.c
--- rpm/lib/rpminstall.c 17 Oct 2007 01:45:47 -0000 1.174
+++ rpm/lib/rpminstall.c 17 Oct 2007 16:53:22 -0000 1.175
@@ -308,7 +308,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpmrollback.c
--- rpm/lib/rpmrollback.c 17 Oct 2007 01:45:47 -0000 1.19
+++ rpm/lib/rpmrollback.c 17 Oct 2007 16:53:22 -0000 1.20
@@ -92,7 +92,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -146,7 +146,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -296,7 +296,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.59 -r2.60 rpmte.c
--- rpm/lib/rpmte.c 17 Oct 2007 01:45:47 -0000 2.59
+++ rpm/lib/rpmte.c 17 Oct 2007 16:53:22 -0000 2.60
@@ -97,7 +97,7 @@
int scareMem = 0;
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -220,7 +220,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -608,7 +608,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.110 -r2.111 rpmts.c
--- rpm/lib/rpmts.c 17 Oct 2007 01:45:47 -0000 2.110
+++ rpm/lib/rpmts.c 17 Oct 2007 16:53:22 -0000 2.111
@@ -306,7 +306,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.343 -r1.344 transaction.c
--- rpm/lib/transaction.c 17 Oct 2007 01:45:47 -0000 1.343
+++ rpm/lib/transaction.c 17 Oct 2007 16:53:22 -0000 1.344
@@ -102,7 +102,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -252,7 +252,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -620,7 +620,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.63 -r1.64 header-py.c
--- rpm/python/header-py.c 17 Oct 2007 01:45:49 -0000 1.63
+++ rpm/python/header-py.c 17 Oct 2007 16:53:24 -0000 1.64
@@ -174,7 +174,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -208,7 +208,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -310,7 +310,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -344,7 +344,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -713,7 +713,7 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -769,7 +769,7 @@
/*@*/
{
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
+ rpmTagData he_p = { .ptr = NULL };
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;
@@ -805,7 +805,7 @@
/* Retrieve data from extension or header. */
if (ext) {
- he->p = (hRET_t *)&data;
+ he->p = (hRET_t *)&data; /* NOCAST */
ext->u.tagFunction(s->h, he);
freeData = he->freeData;
} else {
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
============================================================================
$ cvs diff -u -r1.17 -r1.18 fprint.c
--- rpm/rpmdb/fprint.c 14 Oct 2007 22:54:00 -0000 1.17
+++ rpm/rpmdb/fprint.c 17 Oct 2007 16:53:24 -0000 1.18
@@ -250,8 +250,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 ** baseNames;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.16 -r1.17 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 17 Oct 2007 00:32:26 -0000 1.16
+++ rpm/rpmdb/hdrNVR.c 17 Oct 2007 16:53:24 -0000 1.17
@@ -37,8 +37,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 tagMacro * tagm;
@@ -93,8 +93,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 tagMacro * tagm;
@@ -183,8 +183,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 hcolor = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.13 -r1.14 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 16 Oct 2007 21:02:03 -0000 1.13
+++ rpm/rpmdb/hdrfmt.c 17 Oct 2007 16:53:24 -0000 1.14
@@ -867,12 +867,13 @@
static int triggercondsTag(Header h, HE_t he)
/*@modifies he @*/
{
- hRET_t flags;
- int_32 * indices;
- char ** names, ** versions;
+ rpmTagData flags;
+ rpmTagData indices;
+ rpmTagData names;
+ rpmTagData versions;
int numNames, numScripts;
const char ** conds;
- char ** s;
+ rpmTagData s;
char * item, * flagsStr;
char * chptr;
int i, j, xx;
@@ -901,17 +902,17 @@
chptr = xstrdup("");
for (j = 0; j < numNames; j++) {
- if (indices[j] != i)
+ if (indices.i32p[j] != i)
/*@innercontinue@*/ continue;
- item = xmalloc(strlen(names[j]) + strlen(versions[j]) + 20);
+ item = xmalloc(strlen(names.argv[j]) + strlen(versions.argv[j]) + 20);
if (flags.i32p[j] & RPMSENSE_SENSEMASK) {
buf[0] = '%', buf[1] = '\0';
flagsStr = depflagsFormat(RPM_INT32_TYPE, &flags, buf, 0, j);
- sprintf(item, "%s %s %s", names[j], flagsStr, versions[j]);
+ sprintf(item, "%s %s %s", names.argv[j], flagsStr, versions.argv[j]);
flagsStr = _free(flagsStr);
} else
- strcpy(item, names[j]);
+ strcpy(item, names.argv[j]);
chptr = xrealloc(chptr, strlen(chptr) + strlen(item) + 5);
if (*chptr != '\0') strcat(chptr, ", ");
@@ -923,9 +924,9 @@
}
exit:
- names = headerFreeData(names, -1);
- versions = headerFreeData(versions, -1);
- s = headerFreeData(s, -1);
+ names.ptr = headerFreeData(names.ptr, -1);
+ versions.ptr = headerFreeData(versions.ptr, -1);
+ s.ptr = headerFreeData(s.ptr, -1);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.h
============================================================================
$ cvs diff -u -r1.38 -r1.39 header.h
--- rpm/rpmdb/header.h 17 Oct 2007 01:45:49 -0000 1.38
+++ rpm/rpmdb/header.h 17 Oct 2007 16:53:24 -0000 1.39
@@ -136,7 +136,7 @@
/** \ingroup header
*/
-typedef const hRET_t rpmTagData;
+typedef hRET_t rpmTagData;
/** \ingroup header
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.17 -r1.18 pkgio.c
--- rpm/rpmdb/pkgio.c 14 Oct 2007 22:54:00 -0000 1.17
+++ rpm/rpmdb/pkgio.c 17 Oct 2007 16:53:24 -0000 1.18
@@ -75,8 +75,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 = (_dig ? _dig : rpmtsDig(ts));
@@ -542,8 +542,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 * sighp = ptr;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.188 -r1.189 rpmdb.c
--- rpm/rpmdb/rpmdb.c 17 Oct 2007 01:45:49 -0000 1.188
+++ rpm/rpmdb/rpmdb.c 17 Oct 2007 16:53:24 -0000 1.189
@@ -861,8 +861,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 * fn = NULL;
@@ -1411,8 +1411,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 * dirName;
@@ -2155,8 +2155,8 @@
{
HGE_t hge = (HGE_t) headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 numbuf[32];
@@ -2786,8 +2786,8 @@
union _dbswap mi_offset;
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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;
@@ -3101,8 +3101,8 @@
HGE_t hge = (HGE_t) headerGetExtension;
HAE_t hae = (HAE_t) headerAddEntry;
rpmTagType he_t;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c;
+ rpmTagData he_p = { .ptr = NULL };
+ rpmTagCount he_c;
HE_s he_s = { .tag = 0, .t = &he_t, .p = &he_p, .c = &he_c, .freeData = 0 };
HE_t he = &he_s;
sigset_t signalMask;
@@ -3260,7 +3260,7 @@
if (db->db_tagn != NULL)
for (dbix = 0; dbix < db->db_ndbi; dbix++) {
byte * bin = NULL;
- hRET_t requireFlags;
+ rpmTagData requireFlags;
rpmRC rpmrc;
int i, j;
@@ -3579,8 +3579,8 @@
DBT * data;
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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;
rpmdbMatchIterator mi;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.10 -r1.11 signature.c
--- rpm/rpmdb/signature.c 17 Oct 2007 00:32:26 -0000 1.10
+++ rpm/rpmdb/signature.c 17 Oct 2007 16:53:24 -0000 1.11
@@ -525,8 +525,8 @@
{
HGE_t hge = (HGE_t)headerGetExtension;
rpmTagType he_t = 0;
- hRET_t he_p = { .ptr = NULL };
- int_32 he_c = 0;
+ rpmTagData he_p = { .ptr = NULL };
+ 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 = NULL;
@@ .
Received on Wed Oct 17 18:53:24 2007