From: Panu Matilainen Date: Tue, 27 May 2008 18:49:02 +0000 (+0300) Subject: Remove RPMTAG_BASENAMES special casing from rpmdbAdd() X-Git-Tag: rpm-4.6.0-rc1~455 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4f021461d22880794c69e2974173ad03f640d5e;p=platform%2Fupstream%2Frpm.git Remove RPMTAG_BASENAMES special casing from rpmdbAdd() - no longer needed as we don't support uncompressed filelists in the db anyway (commit 30bb2ba4c8e481dd1c18e6ce8cd6c563fb42e23b) --- diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 8fd871b..f2c2c78 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -2600,9 +2600,6 @@ int rpmdbAdd(rpmdb db, int iid, Header h, HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; sigset_t signalMask; - const char ** baseNames; - rpmTagType bnt; - rpm_count_t count = 0; dbiIndex dbi; int dbix; union _dbswap mi_offset; @@ -2626,14 +2623,6 @@ int rpmdbAdd(rpmdb db, int iid, Header h, xx = headerAddEntry(h, RPMTAG_INSTALLTID, RPM_INT32_TYPE, &tid, 1); } - /* - * If old style filename tags is requested, the basenames need to be - * retrieved early, and the header needs to be converted before - * being written to the package header database. - */ - - xx = hge(h, RPMTAG_BASENAMES, &bnt, (rpm_data_t *) &baseNames, &count); - (void) blockSignals(&signalMask); { @@ -2768,11 +2757,6 @@ int rpmdbAdd(rpmdb db, int iid, Header h, xx = dbiSync(dbi, 0); continue; break; - case RPMTAG_BASENAMES: /* XXX preserve legacy behavior */ - rpmtype = bnt; - rpmvals = baseNames; - rpmcnt = count; - break; case RPMTAG_REQUIRENAME: xx = hge(h, rpmtag, &rpmtype, (rpm_data_t *)&rpmvals, &rpmcnt); xx = hge(h, RPMTAG_REQUIREFLAGS, NULL, (rpm_data_t *)&requireFlags, NULL);