diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2008-10-30 14:07:29 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2008-10-30 14:07:29 +0200 |
commit | ce33decefa68cdde3ed332c629dc661defc963d1 (patch) | |
tree | 476d65e836215b33d66e20d15214075cbd0ca221 | |
parent | 6c91bf043776319bc0b78852ecf65a56501c60e1 (diff) | |
download | rpm-ce33decefa68cdde3ed332c629dc661defc963d1.tar.gz rpm-ce33decefa68cdde3ed332c629dc661defc963d1.tar.bz2 rpm-ce33decefa68cdde3ed332c629dc661defc963d1.zip |
Change all in-tree rpmdsNew() uses to non-scaremem
- shouldn't affect anything at all
-rw-r--r-- | lib/depends.c | 5 | ||||
-rw-r--r-- | lib/legacy.c | 2 | ||||
-rw-r--r-- | lib/psm.c | 3 | ||||
-rw-r--r-- | python/rpmds-py.c | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/lib/depends.c b/lib/depends.c index 810e90965..852135ad0 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -656,7 +656,6 @@ static int checkPackageDeps(rpmts ts, const char * pkgNEVRA, static int checkPackageSet(rpmts ts, const char * dep, rpmdbMatchIterator mi, int adding) { - int scareMem = 1; Header h; int ec = 0; @@ -668,9 +667,9 @@ static int checkPackageSet(rpmts ts, const char * dep, int rc; pkgNEVRA = headerGetNEVRA(h, NULL); - requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem); + requires = rpmdsNew(h, RPMTAG_REQUIRENAME, 0); (void) rpmdsSetNoPromote(requires, _rpmds_nopromote); - conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem); + conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, 0); (void) rpmdsSetNoPromote(conflicts, _rpmds_nopromote); rc = checkPackageDeps(ts, pkgNEVRA, requires, conflicts, dep, 0, adding); conflicts = rpmdsFree(conflicts); diff --git a/lib/legacy.c b/lib/legacy.c index 6d3129ef5..b2fcc5716 100644 --- a/lib/legacy.c +++ b/lib/legacy.c @@ -167,7 +167,7 @@ static void providePackageNVR(Header h) } /* see if we already have this provide */ - hds = rpmdsNew(h, RPMTAG_PROVIDENAME, 1); + hds = rpmdsNew(h, RPMTAG_PROVIDENAME, 0); nvrds = rpmdsSingle(RPMTAG_PROVIDENAME, name, pEVR, pFlags); if (rpmdsFind(hds, nvrds) >= 0) { bingo = 0; @@ -906,7 +906,6 @@ static rpmRC handleOneTrigger(const rpmpsm psm, Header sourceH, Header trigH, int arg2, unsigned char * triggersAlreadyRun) { - int scareMem = 1; const rpmts ts = psm->ts; rpmds trigger = NULL; const char * sourceName; @@ -918,7 +917,7 @@ static rpmRC handleOneTrigger(const rpmpsm psm, xx = headerNVR(sourceH, &sourceName, NULL, NULL); xx = headerNVR(trigH, &triggerName, NULL, NULL); - trigger = rpmdsInit(rpmdsNew(trigH, RPMTAG_TRIGGERNAME, scareMem)); + trigger = rpmdsInit(rpmdsNew(trigH, RPMTAG_TRIGGERNAME, 0)); if (trigger == NULL) return rc; diff --git a/python/rpmds-py.c b/python/rpmds-py.c index dc05d5b31..6ea2a5928 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -503,7 +503,7 @@ fprintf(stderr, "*** rpmds_init(%p,%p,%p)\n", s, args, kwds); return -1; } } - s->ds = rpmdsNew(hdrGetHeader(ho), tagN, flags); + s->ds = rpmdsNew(hdrGetHeader(ho), tagN, 0); s->active = 0; return 0; @@ -667,7 +667,7 @@ hdr_dsFromHeader(PyObject * s, PyObject * args, PyObject * kwds) return NULL; } } - return rpmds_Wrap( rpmdsNew(hdrGetHeader(ho), tagN, flags) ); + return rpmds_Wrap( rpmdsNew(hdrGetHeader(ho), tagN, 0) ); } rpmdsObject * |