summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/header-py.c10
-rw-r--r--python/header-py.h2
-rw-r--r--python/rpmdb-py.c2
-rw-r--r--python/rpmds-py.c10
-rw-r--r--python/rpmfi-py.c4
-rw-r--r--python/rpmmi-py.c2
-rw-r--r--python/rpmte-py.c4
-rw-r--r--python/rpmts-py.c6
8 files changed, 20 insertions, 20 deletions
diff --git a/python/header-py.c b/python/header-py.c
index 5cc1abab8..173b2f490 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -143,7 +143,7 @@ static PyObject * hdrKeyList(hdrObject * s)
{
PyObject * list, *o;
HeaderIterator hi;
- rpm_tag_t tag;
+ rpmTag tag;
rpmTagType type;
list = PyList_New(0);
@@ -336,7 +336,7 @@ static void hdr_dealloc(hdrObject * s)
/** \ingroup py_c
*/
-rpm_tag_t tagNumFromPyObject (PyObject *item)
+rpmTag tagNumFromPyObject (PyObject *item)
{
char * str;
@@ -362,7 +362,7 @@ rpm_tag_t tagNumFromPyObject (PyObject *item)
* @retval c address of number of values
* @return 0 on success, 1 on bad magic, 2 on error
*/
-static int dressedHeaderGetEntry(Header h, rpm_tag_t tag, rpmTagType *type,
+static int dressedHeaderGetEntry(Header h, rpmTag tag, rpmTagType *type,
void **p, rpm_count_t *c)
{
switch (tag) {
@@ -414,7 +414,7 @@ static int dressedHeaderGetEntry(Header h, rpm_tag_t tag, rpmTagType *type,
static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
{
rpmTagType tagtype, type;
- rpm_tag_t tag = RPMTAG_NOT_FOUND;
+ rpmTag tag = RPMTAG_NOT_FOUND;
rpm_count_t count, i;
rpm_data_t data;
PyObject * o, * metao;
@@ -780,7 +780,7 @@ int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag)
int32_t * oldMatch;
hdrObject * hdr;
rpm_count_t c, count = 0;
- rpm_tag_t tag;
+ rpmTag tag;
rpmTagType type;
void * p;
diff --git a/python/header-py.h b/python/header-py.h
index 8937520c8..b1197b0b2 100644
--- a/python/header-py.h
+++ b/python/header-py.h
@@ -21,7 +21,7 @@ hdrObject * hdr_Wrap(Header h);
Header hdrGetHeader(hdrObject * h);
-rpm_tag_t tagNumFromPyObject (PyObject *item);
+rpmTag tagNumFromPyObject (PyObject *item);
PyObject * labelCompare (PyObject * self, PyObject * args);
PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds);
diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index 154e9771c..45ebaa1c6 100644
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -109,7 +109,7 @@ rpmdb_Match (rpmdbObject * s, PyObject * args, PyObject * kwds)
PyObject *TagN = NULL;
char *key = NULL;
int len = 0;
- rpm_tag_t tag = RPMDBI_PACKAGES;
+ rpmTag tag = RPMDBI_PACKAGES;
char * kwlist[] = {"tagNumber", "key", "len", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Ozi", kwlist,
diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 87b12dc4f..ab4d5586b 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -213,7 +213,7 @@ rpmds_iternext(rpmdsObject * s)
if (rpmdsNext(s->ds) >= 0) {
const char * N = rpmdsN(s->ds);
const char * EVR = rpmdsEVR(s->ds);
- rpm_tag_t tagN = rpmdsTagN(s->ds);
+ rpmTag tagN = rpmdsTagN(s->ds);
rpmsenseFlags Flags = rpmdsFlags(s->ds);
if (N != NULL) N = xstrdup(N);
@@ -485,7 +485,7 @@ static int rpmds_init(rpmdsObject * s, PyObject *args, PyObject *kwds)
{
hdrObject * ho = NULL;
PyObject * to = NULL;
- rpm_tag_t tagN = RPMTAG_REQUIRENAME;
+ rpmTag tagN = RPMTAG_REQUIRENAME;
rpmsenseFlags flags = 0;
char * kwlist[] = {"header", "tag", "flags", NULL};
@@ -625,7 +625,7 @@ rpmdsObject *
rpmds_Single(PyObject * s, PyObject * args, PyObject * kwds)
{
PyObject * to = NULL;
- rpm_tag_t tagN = RPMTAG_PROVIDENAME;
+ rpmTag tagN = RPMTAG_PROVIDENAME;
const char * N;
const char * EVR = NULL;
rpmsenseFlags Flags = 0;
@@ -652,7 +652,7 @@ hdr_dsFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
{
hdrObject * ho = (hdrObject *)s;
PyObject * to = NULL;
- rpm_tag_t tagN = RPMTAG_REQUIRENAME;
+ rpmTag tagN = RPMTAG_REQUIRENAME;
rpmsenseFlags flags = 0;
char * kwlist[] = {"to", "flags", NULL};
@@ -674,7 +674,7 @@ rpmdsObject *
hdr_dsOfHeader(PyObject * s)
{
hdrObject * ho = (hdrObject *)s;
- rpm_tag_t tagN = RPMTAG_PROVIDENAME;
+ rpmTag tagN = RPMTAG_PROVIDENAME;
rpmsenseFlags Flags = RPMSENSE_EQUAL;
return rpmds_Wrap( rpmdsThis(hdrGetHeader(ho), tagN, Flags) );
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 731deb5ff..15c6d3002 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -398,7 +398,7 @@ static int rpmfi_init(rpmfiObject * s, PyObject *args, PyObject *kwds)
hdrObject * ho = NULL;
PyObject * to = NULL;
rpmts ts = NULL; /* XXX FIXME: fiFromHeader should be a ts method. */
- rpm_tag_t tagN = RPMTAG_BASENAMES;
+ rpmTag tagN = RPMTAG_BASENAMES;
int flags = 0;
char * kwlist[] = {"header", "tag", "flags", NULL};
@@ -539,7 +539,7 @@ hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
hdrObject * ho = (hdrObject *)s;
PyObject * to = NULL;
rpmts ts = NULL; /* XXX FIXME: fiFromHeader should be a ts method. */
- rpm_tag_t tagN = RPMTAG_BASENAMES;
+ rpmTag tagN = RPMTAG_BASENAMES;
int flags = 0;
char * kwlist[] = {"tag", "flags", NULL};
diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 4ff9832b7..3c347ac08 100644
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -137,7 +137,7 @@ rpmmi_Pattern(rpmmiObject * s, PyObject * args, PyObject * kwds)
PyObject *TagN = NULL;
int type;
char * pattern;
- rpm_tag_t tag;
+ rpmTag tag;
char * kwlist[] = {"tag", "type", "patern", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "Ois:Pattern", kwlist,
diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index 0ded63e7c..86f646866 100644
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -186,7 +186,7 @@ rpmte_DS(rpmteObject * s, PyObject * args, PyObject * kwds)
{
PyObject * TagN = NULL;
rpmds ds;
- rpm_tag_t tag;
+ rpmTag tag;
char * kwlist[] = {"tag", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:DS", kwlist, &TagN))
@@ -216,7 +216,7 @@ rpmte_FI(rpmteObject * s, PyObject * args, PyObject * kwds)
{
PyObject * TagN = NULL;
rpmfi fi;
- rpm_tag_t tag;
+ rpmTag tag;
char * kwlist[] = {"tag", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:FI", kwlist, &TagN))
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 16d1eae28..103195721 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -499,7 +499,7 @@ static PyObject *
rpmts_IDTXload(rpmtsObject * s)
{
PyObject * result = NULL;
- rpm_tag_t tag = RPMTAG_INSTALLTID;
+ rpmTag tag = RPMTAG_INSTALLTID;
IDTX idtx;
if (_rpmts_debug)
@@ -539,7 +539,7 @@ static PyObject *
rpmts_IDTXglob(rpmtsObject * s)
{
PyObject * result = NULL;
- rpm_tag_t tag = RPMTAG_REMOVETID;
+ rpmTag tag = RPMTAG_REMOVETID;
char * globstr;
IDTX idtx;
@@ -1255,7 +1255,7 @@ rpmts_Match(rpmtsObject * s, PyObject * args, PyObject * kwds)
/* XXX lkey *must* be a 32 bit integer, int "works" on all known platforms. */
int lkey = 0;
int len = 0;
- rpm_tag_t tag = RPMDBI_PACKAGES;
+ rpmTag tag = RPMDBI_PACKAGES;
char * kwlist[] = {"tagNumber", "key", NULL};
if (_rpmts_debug)