From fa8684da9200c6b1e2a1d3686f55de915fc9f545 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 8 Jun 2011 19:01:13 +0300 Subject: [PATCH] Move the remaining DBT's in rpmdbInitIterator() to (more) local scope --- lib/rpmdb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rpmdb.c b/lib/rpmdb.c index e530032..19e999c 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -1958,12 +1958,8 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmDbiTagVal rpmtag, * Otherwise, retrieve join keys for secondary lookup. */ if (rpmtag != RPMDBI_PACKAGES) { - DBT key, data; int rc = 0; - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - if (keyp) { if (isLabel) { @@ -1976,6 +1972,10 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmDbiTagVal rpmtag, } else { /* get all entries from index */ dbiCursor dbc = dbiCursorInit(dbi, 0); + DBT key, data; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); while ((rc = dbiCursorGet(dbc, &key, &data, DB_NEXT)) == 0) { dbiIndexSet newset = NULL; -- 2.7.4