Rename some dbcCursorX function to idxdbX

They are not generic cursor functions, and the change makes
the code consistent with the pkgdbX functions.

3 files changed, 23 insertions, 23 deletions

diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index ac36f9124..c07c292d2 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -447,7 +447,7 @@ static int dbiCursorDel(dbiCursor dbc, DBT * key, DBT * data, unsigned int flags
     return rc;
 }
 
-const void * dbiCursorKey(dbiCursor dbc, unsigned int *keylen)
+const void * idxdbKey(dbiCursor dbc, unsigned int *keylen)
 {
     const void *key = NULL;
     if (dbc) {
@@ -837,7 +837,7 @@ static int set2dbt(dbiIndex dbi, DBT * data, dbiIndexSet set)
     return 0;
 }
 
-rpmRC dbcCursorGet(dbiCursor dbc, const char *keyp, size_t keylen,
+rpmRC idxdbGet(dbiCursor dbc, const char *keyp, size_t keylen,
 			  dbiIndexSet *set, int searchType)
 {
     rpmRC rc = RPMRC_FAIL; /* assume failure */
@@ -945,8 +945,8 @@ static rpmRC updateIndex(dbiCursor dbc, const char *keyp, unsigned int keylen,
     return rc;
 }
 
-rpmRC dbcCursorPut(dbiCursor dbc, const char *keyp, size_t keylen,
-		   dbiIndexItem rec)
+rpmRC idxdbPut(dbiCursor dbc, const char *keyp, size_t keylen,
+	       dbiIndexItem rec)
 {
     dbiIndexSet set = NULL;
     rpmRC rc;
@@ -955,7 +955,7 @@ rpmRC dbcCursorPut(dbiCursor dbc, const char *keyp, size_t keylen,
 	keyp = "";
 	keylen++;
     }
-    rc = dbcCursorGet(dbc, keyp, keylen, &set, DBC_NORMAL_SEARCH);
+    rc = idxdbGet(dbc, keyp, keylen, &set, DBC_NORMAL_SEARCH);
 
     /* Not found means a new key and is not an error. */
     if (rc && rc != RPMRC_NOTFOUND)
@@ -971,8 +971,8 @@ rpmRC dbcCursorPut(dbiCursor dbc, const char *keyp, size_t keylen,
     return rc;
 }
 
-rpmRC dbcCursorDel(dbiCursor dbc, const char *keyp, size_t keylen,
-		   dbiIndexItem rec)
+rpmRC idxdbDel(dbiCursor dbc, const char *keyp, size_t keylen,
+	       dbiIndexItem rec)
 {
     dbiIndexSet set = NULL;
     rpmRC rc;
@@ -981,7 +981,7 @@ rpmRC dbcCursorDel(dbiCursor dbc, const char *keyp, size_t keylen,
 	keyp = "";
 	keylen++;
     }
-    rc = dbcCursorGet(dbc, keyp, keylen, &set, DBC_NORMAL_SEARCH);
+    rc = idxdbGet(dbc, keyp, keylen, &set, DBC_NORMAL_SEARCH);
     if (rc)
 	return rc;
 
diff --git a/lib/backend/dbi.h b/lib/backend/dbi.h
index ad9b6d431..36ff4490a 100644
--- a/lib/backend/dbi.h
+++ b/lib/backend/dbi.h
@@ -198,8 +198,6 @@ dbiCursor dbiCursorInit(dbiIndex dbi, unsigned int flags);
 RPM_GNUC_INTERNAL
 dbiCursor dbiCursorFree(dbiCursor dbc);
 
-RPM_GNUC_INTERNAL
-const void * dbiCursorKey(dbiCursor dbc, unsigned int *keylen);
 
 RPM_GNUC_INTERNAL
 int pkgdbPut(dbiIndex dbi, dbiCursor dbc,  unsigned int hdrNum,
@@ -214,14 +212,16 @@ RPM_GNUC_INTERNAL
 int pkgdbNew(dbiIndex dbi, dbiCursor dbc,  unsigned int *hdrNum);
 
 RPM_GNUC_INTERNAL
-rpmRC dbcCursorGet(dbiCursor dbc, const char *keyp, size_t keylen,
-		   dbiIndexSet *set, int curFlags);
+rpmRC idxdbGet(dbiCursor dbc, const char *keyp, size_t keylen,
+               dbiIndexSet *set, int curFlags);
+RPM_GNUC_INTERNAL
+rpmRC idxdbPut(dbiCursor dbc, const char *keyp, size_t keylen,
+               dbiIndexItem rec);
 RPM_GNUC_INTERNAL
-rpmRC dbcCursorPut(dbiCursor dbc, const char *keyp, size_t keylen,
-		   dbiIndexItem rec);
+rpmRC idxdbDel(dbiCursor dbc, const char *keyp, size_t keylen,
+               dbiIndexItem rec);
 RPM_GNUC_INTERNAL
-rpmRC dbcCursorDel(dbiCursor dbc, const char *keyp, size_t keylen,
-		   dbiIndexItem rec);
+const void * idxdbKey(dbiCursor dbc, unsigned int *keylen);
 
 #ifdef __cplusplus
 }
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index a967b5186..6b75b2d5b 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -224,10 +224,10 @@ static rpmRC indexGet(dbiIndex dbi, const char *keyp, size_t keylen,
 	if (keyp) {
 	    if (keylen == 0)
 		keylen = strlen(keyp);
-	    rc = dbcCursorGet(dbc, keyp, keylen, set, DBC_NORMAL_SEARCH);
+	    rc = idxdbGet(dbc, keyp, keylen, set, DBC_NORMAL_SEARCH);
 	} else {
 	    do {
-		rc = dbcCursorGet(dbc, NULL, 0, set, DBC_NORMAL_SEARCH);
+		rc = idxdbGet(dbc, NULL, 0, set, DBC_NORMAL_SEARCH);
 	    } while (rc == RPMRC_OK);
 
 	    /* If we got some results, not found is not an error */
@@ -250,7 +250,7 @@ static rpmRC indexPrefixGet(dbiIndex dbi, const char *pfx, size_t plen,
 
 	if (plen == 0)
 	    plen = strlen(pfx);
-	rc = dbcCursorGet(dbc, pfx, plen, set, DBC_PREFIX_SEARCH);
+	rc = idxdbGet(dbc, pfx, plen, set, DBC_PREFIX_SEARCH);
 
 	dbiCursorFree(dbc);
     }
@@ -1955,9 +1955,9 @@ int rpmdbIndexIteratorNext(rpmdbIndexIterator ii, const void ** key, size_t * ke
     /* free old data */
     ii->ii_set = dbiIndexSetFree(ii->ii_set);
 
-    rc = dbcCursorGet(ii->ii_dbc, NULL, 0, &ii->ii_set, DBC_NORMAL_SEARCH);
+    rc = idxdbGet(ii->ii_dbc, NULL, 0, &ii->ii_set, DBC_NORMAL_SEARCH);
 
-    *key = dbiCursorKey(ii->ii_dbc, &iikeylen);
+    *key = idxdbKey(ii->ii_dbc, &iikeylen);
     *keylen = iikeylen;
 
     return (rc == RPMRC_OK) ? 0 : -1;
@@ -2093,7 +2093,7 @@ static void logAddRemove(const char *dbiname, int removing, rpmtd tagdata)
 
 static rpmRC indexDel(dbiIndex dbi, rpmTagVal rpmtag, unsigned int hdrNum, Header h)
 {
-    return tag2index(dbi, rpmtag, hdrNum, h, dbcCursorDel);
+    return tag2index(dbi, rpmtag, hdrNum, h, idxdbDel);
 }
 
 int rpmdbRemove(rpmdb db, unsigned int hdrNum)
@@ -2314,7 +2314,7 @@ exit:
 
 static rpmRC indexPut(dbiIndex dbi, rpmTagVal rpmtag, unsigned int hdrNum, Header h)
 {
-    return tag2index(dbi, rpmtag, hdrNum, h, dbcCursorPut);
+    return tag2index(dbi, rpmtag, hdrNum, h, idxdbPut);
 }
 
 int rpmdbAdd(rpmdb db, Header h)