diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-09-08 09:43:57 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-09-08 09:43:57 +0300 |
| commit | 03aac530fb53282f9a876fc09dbc06159031d4ae (patch) | |
| tree | 35c538f811115f6fe59ba9e49eb6979c9c5567c1 /lib | |
| parent | fbdd7095b4edc0ae890ad40ddb4529259a53ae7d (diff) | |
| download | rpm-03aac530fb53282f9a876fc09dbc06159031d4ae.tar.gz rpm-03aac530fb53282f9a876fc09dbc06159031d4ae.tar.bz2 rpm-03aac530fb53282f9a876fc09dbc06159031d4ae.zip | |
Push the flag foo into rpmfiPopulate(), explicit HEADERGET_ALLOC for others
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmfi.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 5c447042e..5a850e040 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -1088,9 +1088,11 @@ static rpmsid * tag2pool(rpmstrPool pool, Header h, rpmTag tag) if (headerGet((_h), (_tag), (_td), (_flags))) \ _data = (td.data) -static int rpmfiPopulate(rpmfi fi, Header h, rpmfiFlags flags, - headerGetFlags defFlags, headerGetFlags scareFlags) +static int rpmfiPopulate(rpmfi fi, Header h, rpmfiFlags flags) { + headerGetFlags scareFlags = (flags & RPMFI_KEEPHEADER) ? + HEADERGET_MINMEM : HEADERGET_ALLOC; + headerGetFlags defFlags = HEADERGET_ALLOC; struct rpmtd_s fdigests, digalgo, td; unsigned char * t; @@ -1182,24 +1184,21 @@ rpmfi rpmfiNewPool(rpmstrPool pool, Header h, rpmTagVal tagN, rpmfiFlags flags) { rpmfi fi = xcalloc(1, sizeof(*fi)); struct rpmtd_s td; - headerGetFlags scareFlags = (flags & RPMFI_KEEPHEADER) ? - HEADERGET_MINMEM : HEADERGET_ALLOC; - headerGetFlags defFlags = HEADERGET_ALLOC; fi->magic = RPMFIMAGIC; fi->i = -1; fi->fiflags = flags; - _hgfi(h, RPMTAG_BASENAMES, &td, defFlags, fi->bnl); + _hgfi(h, RPMTAG_BASENAMES, &td, HEADERGET_ALLOC, fi->bnl); fi->fc = rpmtdCount(&td); if (fi->fc == 0) { goto exit; } - _hgfi(h, RPMTAG_DIRNAMES, &td, defFlags, fi->dnl); + _hgfi(h, RPMTAG_DIRNAMES, &td, HEADERGET_ALLOC, fi->dnl); fi->dc = rpmtdCount(&td); - _hgfi(h, RPMTAG_DIRINDEXES, &td, defFlags, fi->dil); + _hgfi(h, RPMTAG_DIRINDEXES, &td, HEADERGET_ALLOC, fi->dil); /* Is our filename triplet sane? */ if (fi->dc == 0 || fi->dc > fi->fc || rpmtdCount(&td) != fi->fc) @@ -1217,7 +1216,7 @@ rpmfi rpmfiNewPool(rpmstrPool pool, Header h, rpmTagVal tagN, rpmfiFlags flags) if (miscpool == NULL) miscpool = rpmstrPoolCreate(); - if (rpmfiPopulate(fi, h, flags, defFlags, scareFlags)) + if (rpmfiPopulate(fi, h, flags)) goto errxit; /* lazily alloced from rpmfiFN() */ |