- Grand Renaming of rpm data types.

CVS patchset: 5439
CVS date: 2002/05/19 18:42:25

2 files changed, 16 insertions, 14 deletions

diff --git a/python/header-py.c b/python/header-py.c
index 9126789d7..aeec2fe6b 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -8,6 +8,7 @@
 #include "rpmio_internal.h"
 #include "rpmcli.h"	/* XXX for rpmCheckSig */
 
+#include "rpmps.h"
 #include "rpmfi.h"
 #include "rpmts.h"	/* XXX for ts->rpmdb */
 
@@ -178,21 +179,21 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
 
     fileNumber = (int) PyInt_AsLong(args);
 
-    {	rpmTransactionSet ts;
+    {	rpmts ts;
 	int scareMem = 1;
-	TFI_t fi;
+	rpmfi fi;
 	int rc;
 
 	ts = rpmtsCreate();
-	fi = fiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem);
-	fi = tfiInit(fi, fileNumber);
-	if (fi != NULL && tfiNext(fi) >= 0) {
+	fi = rpmfiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem);
+	fi = rpmfiInit(fi, fileNumber);
+	if (fi != NULL && rpmfiNext(fi) >= 0) {
 	    /* XXX this routine might use callbacks intelligently. */
 	    rc = rpmVerifyFile(ts, fi, &verifyResult, RPMVERIFY_NONE);
 	} else
 	    rc = 1;
 
-	fi = fiFree(fi, 1);
+	fi = rpmfiFree(fi, 1);
 	rpmtsFree(ts);
 
 	if (rc) {
@@ -781,7 +782,7 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     if (!PyArg_ParseTuple(args, "i", &rawFd)) return NULL;
 
     fd = fdDup(rawFd);
-    {	rpmTransactionSet ts;
+    {	rpmts ts;
 	ts = rpmtsCreate();
 	rc = rpmReadPackageFile(ts, fd, "rpmHeaderFromPackage", &header);
 	rpmtsFree(ts);
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 56579dad6..395fb39dd 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -19,6 +19,7 @@
 #include "rpmcli.h"	/* XXX for rpmCheckSig */
 
 #include "rpmdb.h"
+#include "rpmps.h"
 #include "rpmts.h"	/* XXX for ts->rpmdb */
 
 #include "legacy.h"
@@ -159,7 +160,7 @@ typedef struct rpmtsObject_s rpmtsObject;
 struct rpmtsObject_s {
     PyObject_HEAD;
     rpmdbObject * dbo;
-    rpmTransactionSet ts;
+    rpmts ts;
     PyObject * keyList;			/* keeps reference counts correct */
     FD_t scriptFd;
 } ;
@@ -235,7 +236,7 @@ static PyObject * py_rpmtsRemove(rpmtsObject * s, PyObject * args) {
 /** \ingroup python
  */
 static PyObject * py_rpmtsDepCheck(rpmtsObject * s, PyObject * args) {
-    rpmProblemSet ps;
+    rpmps ps;
     rpmProblem p;
     PyObject * list, * cf;
     int i;
@@ -306,7 +307,7 @@ static PyObject * py_rpmtsDepCheck(rpmtsObject * s, PyObject * args) {
 	    Py_DECREF(cf);
 	}
 
-	ps = rpmProblemSetFree(ps);
+	ps = rpmpsFree(ps);
 
 	return list;
     }
@@ -420,7 +421,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
     int flags, ignoreSet;
     int rc, i;
     PyObject * list;
-    rpmProblemSet ps;
+    rpmps ps;
     struct tsCallbackType cbInfo;
 
     if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb,
@@ -436,7 +437,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
     ps = rpmtsGetProblems(s->ts);
 
     if (cbInfo.pythonError) {
-	ps = rpmProblemSetFree(ps);
+	ps = rpmpsFree(ps);
 	return NULL;
     }
 
@@ -459,7 +460,7 @@ static PyObject * py_rpmtsRun(rpmtsObject * s, PyObject * args)
 	Py_DECREF(prob);
     }
 
-    ps = rpmProblemSetFree(ps);
+    ps = rpmpsFree(ps);
 
     return list;
 }
@@ -837,7 +838,7 @@ static PyObject * checkSig (PyObject * self, PyObject * args) {
     int rc = 255;
 
     if (PyArg_ParseTuple(args, "si", &filename, &flags)) {
-	rpmTransactionSet ts;
+	rpmts ts;
 	const char * av[2];
 	QVA_t ka = memset(alloca(sizeof(*ka)), 0, sizeof(*ka));