From: Florian Festi Date: Fri, 28 Nov 2008 11:16:00 +0000 (+0100) Subject: Delete _dbiIndexItem.fpNum as it is no longer used and also does not really fit in... X-Git-Tag: rpm-4.7.0-beta1~185 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d918b5aa0a4afec407937bb6e1d4b7ae6ba4be3;p=platform%2Fupstream%2Frpm.git Delete _dbiIndexItem.fpNum as it is no longer used and also does not really fit in there --- diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 2960bce..4ecd546 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -376,7 +376,6 @@ static int dbt2set(dbiIndex dbi, DBT * data, dbiIndexSet * setp) } set->recs[i].hdrNum = hdrNum.ui; set->recs[i].tagNum = tagNum.ui; - set->recs[i].fpNum = 0; } break; case 1*sizeof(int32_t): @@ -390,7 +389,6 @@ static int dbt2set(dbiIndex dbi, DBT * data, dbiIndexSet * setp) } set->recs[i].hdrNum = hdrNum.ui; set->recs[i].tagNum = 0; - set->recs[i].fpNum = 0; } break; } @@ -2114,7 +2112,7 @@ void rpmdbSortIterator(rpmdbMatchIterator mi) } /* LCL: segfault */ -static int rpmdbGrowIterator(rpmdbMatchIterator mi, int fpNum) +static int rpmdbGrowIterator(rpmdbMatchIterator mi) { DBC * dbcursor; DBT * key; @@ -2123,7 +2121,6 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi, int fpNum) dbiIndexSet set; int rc; int xx; - int i; if (mi == NULL) return 1; @@ -2159,8 +2156,6 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi, int fpNum) set = NULL; (void) dbt2set(dbi, data, &set); - for (i = 0; i < set->count; i++) - set->recs[i].fpNum = fpNum; #ifdef SQLITE_HACK xx = dbiCclose(dbi, dbcursor, 0); @@ -2352,7 +2347,7 @@ int rpmdbExtendIterator(rpmdbMatchIterator mi, { mi->mi_key.data = (void *) keyp; mi->mi_key.size = keylen ? keylen : strlen(keyp); - return rpmdbGrowIterator(mi, 0); + return rpmdbGrowIterator(mi); } /* diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h index 9de381f..485d9ad 100644 --- a/lib/rpmdb_internal.h +++ b/lib/rpmdb_internal.h @@ -30,7 +30,6 @@ typedef struct _dbiIndex * dbiIndex; struct _dbiIndexItem { unsigned int hdrNum; /*!< header instance in db */ unsigned int tagNum; /*!< tag index in header */ - unsigned int fpNum; /*!< finger print index */ }; /** \ingroup dbi