folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename rpmpsProblem() -> rpmpsGetProblem() to make purpose clearer

This commit is contained in:
Panu Matilainen 2007-10-19 13:25:08 +03:00
parent 92919c2f73
commit 8e59724a58
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rpmps.c
View File

@ -101,7 +101,7 @@ int rpmpsNextIterator(rpmpsi psi)
return i;
}
rpmProblem rpmpsProblem(rpmpsi psi)
rpmProblem rpmpsGetProblem(rpmpsi psi)
{
rpmProblem *p = NULL;
if (psi != NULL && psi->ix >= 0 && psi->ix < rpmpsNumProblems(psi->ps)) {
@ -126,7 +126,7 @@ rpmps rpmpsFree(rpmps ps)
if (ps->probs) {
rpmpsi psi = rpmpsInitIterator(ps);
while (rpmpsNextIterator(psi) >= 0) {
rpmProblemFree(rpmpsProblem(psi));
rpmProblemFree(rpmpsGetProblem(psi));
}
rpmpsFreeIterator(psi);
ps->probs = _free(ps->probs);
@ -415,7 +415,7 @@ void rpmpsPrint(FILE *fp, rpmps ps)
psi = rpmpsInitIterator(ps);
while ((i = rpmpsNextIterator(psi)) >= 0) {
int j;
rpmProblem p = rpmpsProblem(psi);
rpmProblem p = rpmpsGetProblem(psi);
if (p->ignoreProblem)
continue;
@ -423,7 +423,7 @@ void rpmpsPrint(FILE *fp, rpmps ps)
rpmpsi psif = rpmpsInitIterator(ps);
/* Filter already displayed problems. */
while ((j = rpmpsNextIterator(psif)) < i) {
if (!sameProblem(p, rpmpsProblem(psif)))
if (!sameProblem(p, rpmpsGetProblem(psif)))
break;
}
rpmpsFreeIterator(psif);

2
lib/rpmps.h
View File

@ -178,7 +178,7 @@ int rpmpsNextIterator(rpmpsi psi);
* @param psi problem set iterator
* @return current rpmProblem
*/
rpmProblem rpmpsProblem(rpmpsi psi);
rpmProblem rpmpsGetProblem(rpmpsi psi);
/**
* Create a problem set.

2
lib/verify.c
View File

@ -369,7 +369,7 @@ static int verifyDependencies(QVA_t qva, rpmts ts,
rpmlog(RPMLOG_NOTICE, "Unsatisfied dependencies for %s:\n", nevra);
free(nevra);
while (rpmpsNextIterator(psi) >= 0) {
rpmProblem p = rpmpsProblem(psi);
rpmProblem p = rpmpsGetProblem(psi);
rpmlog(RPMLOG_NOTICE, "\t%s\n", rpmProblemString(p));
rc++;
}

4
python/rpmps-py.c
View File

@ -70,7 +70,7 @@ fprintf(stderr, "*** rpmps_iternext(%p) ps %p psi %p\n", s, s->ps, s->psi);
/* If more to do, return a problem set string. */
if (rpmpsNextIterator(s->psi) >= 0) {
result = Py_BuildValue("s", rpmProblemString(rpmpsProblem(s->psi)));
result = Py_BuildValue("s", rpmProblemString(rpmpsGetProblem(s->psi)));
} else {
s->psi = rpmpsFreeIterator(s->psi);
}
@ -152,7 +152,7 @@ fprintf(stderr, "*** rpmps_subscript(%p[%s],%p[%s])\n", s, lbl(s), key, lbl(key)
psi = rpmpsInitIterator(s->ps);
while ((i = rpmpsNextIterator(psi)) >= 0) {
if (i == ix) {
result = Py_BuildValue("s", rpmProblemString(rpmpsProblem(psi)));
result = Py_BuildValue("s", rpmProblemString(rpmpsGetProblem(psi)));
break;
}
}

4
python/rpmts-py.c
View File

@ -409,7 +409,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
int needsFlags, sense;
fnpyKey key;
p = rpmpsProblem(psi);
p = rpmpsGetProblem(psi);
/* XXX autorelocated i386 on ia64, fix system-config-packages! */
if (rpmProblemGetType(p) == RPMPROB_BADRELOCATE)
@ -1126,7 +1126,7 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet);
list = PyList_New(0);
psi = rpmpsInitIterator(ps);
while (rpmpsNextIterator(psi) >= 0) {
rpmProblem p = rpmpsProblem(psi);
rpmProblem p = rpmpsGetProblem(psi);
PyObject * prob = Py_BuildValue("s(isN)", rpmProblemString(p),
rpmProblemGetType(p),
rpmProblemGetStr(p),