removePackage(ts, oh, p);
}
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
/* Add erase elements for obsoleted packages of same color (if any). */
char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
rpmlog(RPMLOG_DEBUG, " Obsoletes: %s\t\terases %s\n",
rpmdsDNEVR(obsoletes)+2, ohNEVRA);
- ohNEVRA = _free(ohNEVRA);
+ free(ohNEVRA);
removePackage(ts, oh, p);
}
}
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
}
checkDS(ts, dcache, te, pkgNEVRA, ds, dep, 0);
- ds = rpmdsFree(ds);
- pkgNEVRA = _free(pkgNEVRA);
+ rpmdsFree(ds);
+ free(pkgNEVRA);
}
rpmdbFreeIterator(mi);
}
while (tsi->tsi_relations != NULL) {
rel = tsi->tsi_relations;
tsi->tsi_relations = tsi->tsi_relations->rel_next;
- rel = _free(rel);
+ free(rel);
}
while (tsi->tsi_forward_relations != NULL) {
rel = tsi->tsi_forward_relations;
tsi->tsi_forward_relations = \
tsi->tsi_forward_relations->rel_next;
- rel = _free(rel);
+ free(rel);
}
}
while ((mi = rpmmiRock) != NULL) {
rpmmiRock = mi->mi_next;
mi->mi_next = NULL;
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
while ((ii = rpmiiRock) != NULL) {
rpmiiRock = ii->ii_next;
ii->ii_next = NULL;
- ii = rpmdbIndexIteratorFree(ii);
+ rpmdbIndexIteratorFree(ii);
}
while ((db = rpmdbRock) != NULL) {
rpmtdFreeData(&bn);
rpmtdFreeData(&dn);
rpmtdFreeData(&di);
- h = headerFree(h);
+ headerFree(h);
}
fpCacheFree(fpc);
(*matches)->recs[gotMatches++] = (*matches)->recs[i];
else
(*matches)->recs[i].hdrNum = 0;
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
if (gotMatches) {
defmode = RPMMIRE_GLOB;
else
defmode = RPMMIRE_DEFAULT;
- t = _free(t);
+ free(t);
}
if (mi == NULL || pattern == NULL)
(void) unblockSignals(&signalMask);
- h = headerFree(h);
+ headerFree(h);
/* XXX return ret; */
return 0;
{ Header nh = (headerIsEntry(h, RPMTAG_HEADERIMAGE)
? headerCopy(h) : NULL);
rc = rpmdbAdd(newdb, (nh ? nh : h));
- nh = headerFree(nh);
+ headerFree(nh);
}
if (rc) {
}
}
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
rc = rpmdbOpen(ts->rootDir, &ts->rdb, ts->dbmode, 0644);
if (rc) {
char * dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL);
- rpmlog(RPMLOG_ERR,
- _("cannot open Packages database in %s\n"), dn);
- dn = _free(dn);
+ rpmlog(RPMLOG_ERR, _("cannot open Packages database in %s\n"), dn);
+ free(dn);
}
return rc;
}
rpmpsMerge(ps, teprobs);
rpmpsFree(teprobs);
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
/* Return NULL on no problems instead of an empty set */
if (rpmpsNumProblems(ps) == 0) {
rpmtsi pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, 0)) != NULL)
rpmteCleanProblems(p);
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
}
void rpmtsClean(rpmts ts)
rpmte p;
while ((p = rpmtsiNext(pi, 0)) != NULL)
fc += rpmfiFC(rpmteFI(p));
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
return fc;
}
rpmStringSetAddEntry(baseNames, baseName);
}
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
rpmStringSetFree(baseNames);
rpmdbSortIterator(mi);
h = newheader;
}
- mi = rpmdbFreeIterator(mi);
+ rpmdbFreeIterator(mi);
}
#define badArch(_a) (rpmMachineScore(RPM_MACHTABLE_INSTARCH, (_a)) == 0)
mi = rpmdbFreeIterator(mi);
}
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
return rpmtsProblems(ts);
}
while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
rpmteProcess(p, goal);
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
return 0; /* what to do about failures? */
}
pi = rpmtsiFree(pi);
exit:
- ht = rpmFpHashFree(ht);
- fpc = fpCacheFree(fpc);
+ rpmFpHashFree(ht);
+ fpCacheFree(fpc);
rpmtsFreeDSI(ts);
return rc;
}
}
(void) rpmdbSync(rpmtsGetRdb(ts));
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
return rc;
}
/* Finish up... */
(void) umask(oldmask);
(void) rpmtsFinish(ts);
- tsprobs = rpmpsFree(tsprobs);
+ rpmpsFree(tsprobs);
rpmlockFree(lock);
return rc;
}