From 1ee991f2a5b83a0d84b80c0d7e7d38877df904e6 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Wed, 9 Dec 2009 09:50:58 +0100 Subject: [PATCH] Remove sqlite hacks from rpmdb.c --- lib/rpmdb.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 52d2437..2f84631 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -1173,10 +1173,8 @@ int rpmdbCountPackages(rpmdb db, const char * name) xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiGet(dbi, dbcursor, &key, &data, DB_SET); -#ifndef SQLITE_HACK xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; -#endif if (rc == 0) { /* success */ dbiIndexSet matches; @@ -1197,11 +1195,6 @@ int rpmdbCountPackages(rpmdb db, const char * name) rc = -1; } -#ifdef SQLITE_HACK - xx = dbiCclose(dbi, dbcursor, 0); - dbcursor = NULL; -#endif - return rc; } @@ -2094,31 +2087,20 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi) xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); rc = dbiGet(dbi, dbcursor, key, data, DB_SET); -#ifndef SQLITE_HACK xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; -#endif if (rc) { /* error/not found */ if (rc != DB_NOTFOUND) rpmlog(RPMLOG_ERR, _("error(%d) getting \"%s\" records from %s index\n"), rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag)); -#ifdef SQLITE_HACK - xx = dbiCclose(dbi, dbcursor, 0); - dbcursor = NULL; -#endif return rc; } set = NULL; (void) dbt2set(dbi, data, &set); -#ifdef SQLITE_HACK - xx = dbiCclose(dbi, dbcursor, 0); - dbcursor = NULL; -#endif - if (mi->mi_set == NULL) { mi->mi_set = set; } else { @@ -3016,13 +2998,6 @@ cont: } unblockSignals(&sigMask); -#ifdef SQLITE_HACK_XXX - if (rc || _olddbapi == _newdbapi) - return rc; - - rc = rpmdbRemoveDatabase(prefix, newdbpath, _newdbapi); - -#endif if (selinux) { (void) matchpathcon_fini(); } -- 2.7.4