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

diff --git a/lib/rpmps.c b/lib/rpmps.c
index cd927f0..a64bad8 100644 (file)
--- a/lib/rpmps.c
+++ b/lib/rpmps.c
@@ -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);

diff --git a/lib/rpmps.h b/lib/rpmps.h
index bacb619..3372584 100644 (file)
--- a/lib/rpmps.h
+++ b/lib/rpmps.h
@@ -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.

diff --git a/lib/verify.c b/lib/verify.c
index d39302e..17022eb 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -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++;       
        }

diff --git a/python/rpmps-py.c b/python/rpmps-py.c
index 6a7a1a4..6a4523f 100644 (file)
--- a/python/rpmps-py.c
+++ b/python/rpmps-py.c
@@ -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;
        }
     }

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index cc8a17a..756cfbe 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -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),