Dont bother with file capability "cache"
- Very few packages have RPMTAG_FILECAPS at all, and the memory saving for those that do is so marginal it hardly matters at all. At least for now, dont bother.
This commit is contained in:
parent
9e47043b2d
commit
4606460e54
|
@ -432,7 +432,7 @@ const char * rpmfiFCapsIndex(rpmfi fi, int ix)
|
||||||
{
|
{
|
||||||
const char *fcaps = NULL;
|
const char *fcaps = NULL;
|
||||||
if (fi != NULL && ix >= 0 && ix < fi->fc) {
|
if (fi != NULL && ix >= 0 && ix < fi->fc) {
|
||||||
fcaps = fi->fcapcache ? strcacheGet(fi->fcapcache, fi->fcaps[ix]) : "";
|
fcaps = fi->fcaps ? fi->fcaps[ix] : "";
|
||||||
}
|
}
|
||||||
return fcaps;
|
return fcaps;
|
||||||
}
|
}
|
||||||
|
@ -1082,7 +1082,6 @@ rpmfi rpmfiFree(rpmfi fi)
|
||||||
fi->flinks = _free(fi->flinks);
|
fi->flinks = _free(fi->flinks);
|
||||||
fi->flangs = _free(fi->flangs);
|
fi->flangs = _free(fi->flangs);
|
||||||
fi->digests = _free(fi->digests);
|
fi->digests = _free(fi->digests);
|
||||||
fi->fcapcache = strcacheFree(fi->fcapcache);
|
|
||||||
fi->fcaps = _free(fi->fcaps);
|
fi->fcaps = _free(fi->fcaps);
|
||||||
|
|
||||||
fi->cdict = _free(fi->cdict);
|
fi->cdict = _free(fi->cdict);
|
||||||
|
@ -1210,10 +1209,8 @@ rpmfi rpmfiNew(const rpmts ts, Header h, rpmTagVal tagN, rpmfiFlags flags)
|
||||||
if (!(flags & RPMFI_NOFILESTATES))
|
if (!(flags & RPMFI_NOFILESTATES))
|
||||||
_hgfi(h, RPMTAG_FILESTATES, &td, defFlags, fi->fstates);
|
_hgfi(h, RPMTAG_FILESTATES, &td, defFlags, fi->fstates);
|
||||||
|
|
||||||
if (!(flags & RPMFI_NOFILECAPS) && headerIsEntry(h, RPMTAG_FILECAPS)) {
|
if (!(flags & RPMFI_NOFILECAPS))
|
||||||
fi->fcapcache = strcacheNew();
|
_hgfi(h, RPMTAG_FILECAPS, &td, defFlags, fi->fcaps);
|
||||||
fi->fcaps = cacheTag(fi->fcapcache, h, RPMTAG_FILECAPS);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(flags & RPMFI_NOFILELINKTOS)) {
|
if (!(flags & RPMFI_NOFILELINKTOS)) {
|
||||||
fi->flinkcache = strcacheNew();
|
fi->flinkcache = strcacheNew();
|
||||||
|
|
|
@ -44,8 +44,7 @@ struct rpmfi_s {
|
||||||
char * fstates; /*!< File state(s) (from header) */
|
char * fstates; /*!< File state(s) (from header) */
|
||||||
|
|
||||||
rpm_color_t * fcolors; /*!< File color bits (header) */
|
rpm_color_t * fcolors; /*!< File color bits (header) */
|
||||||
strcache fcapcache; /*!< File capabilities cache */
|
char ** fcaps; /*!< File capability strings (header) */
|
||||||
scidx_t * fcaps; /*!< Index to file cap(s) cache */
|
|
||||||
|
|
||||||
char ** cdict; /*!< File class dictionary (header) */
|
char ** cdict; /*!< File class dictionary (header) */
|
||||||
rpm_count_t ncdict; /*!< No. of class entries. */
|
rpm_count_t ncdict; /*!< No. of class entries. */
|
||||||
|
|
Loading…
Reference in New Issue