diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-18 06:28:23 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-18 11:27:04 +0200 |
| commit | 61794cf2c0575de8d557b06df7e94865d7afe592 (patch) | |
| tree | f407302e58d7bcf4d652cf933deb54f0a1ede761 | |
| parent | 341aaa65150049ba88308ff692eafcd9834997f0 (diff) | |
| download | rpm-61794cf2c0575de8d557b06df7e94865d7afe592.tar.gz rpm-61794cf2c0575de8d557b06df7e94865d7afe592.tar.bz2 rpm-61794cf2c0575de8d557b06df7e94865d7afe592.zip | |
Remove now unnecessary fi->keep_header
| -rw-r--r-- | lib/rpmfi.c | 7 | ||||
| -rw-r--r-- | lib/rpmfi_internal.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index d1c7b194f..376b63579 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -1166,7 +1166,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); fi->fstates = _free(fi->fstates); - if (!fi->keep_header && fi->h == NULL) { + if (!(fi->fiflags & RPMFI_KEEPHEADER) && fi->h == NULL) { fi->fmtimes = _constfree(fi->fmtimes); fi->fmodes = _free(fi->fmodes); fi->fflags = _constfree(fi->fflags); @@ -1242,8 +1242,7 @@ rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, rpmfiFlags flags) fi->fiflags = flags; fi->scareFlags = scareFlags; - fi->keep_header = (flags & RPMFI_KEEPHEADER); - fi->h = fi->keep_header ? headerLink(h) : NULL; + fi->h = (fi->fiflags & RPMFI_KEEPHEADER) ? headerLink(h) : NULL; if (headerGet(h, RPMTAG_LONGARCHIVESIZE, &td, HEADERGET_EXT)) { asize = rpmtdGetUint64(&td); @@ -1397,7 +1396,7 @@ rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, rpmfiFlags flags) foo = headerFree(foo); } - if (!fi->keep_header) { + if (!(fi->fiflags & RPMFI_KEEPHEADER)) { fi->h = headerFree(fi->h); } diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h index a12068d48..a3cd33ee7 100644 --- a/lib/rpmfi_internal.h +++ b/lib/rpmfi_internal.h @@ -102,7 +102,6 @@ struct rpmfi_s { rpm_loff_t archiveSize; char ** apath; FSM_t fsm; /*!< File state machine data. */ - int keep_header; /*!< Keep header? */ sharedFileInfo replaced; /*!< (TR_ADDED) */ rpm_off_t * replacedSizes; /*!< (TR_ADDED) */ unsigned int record; /*!< (TR_REMOVED) */ |