folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lose fluff from ensureOlder() 

- p and h can't possibly be NULL in the place this gets called
- the single caller doesn't care about return value
This commit is contained in:
Panu Matilainen 2010-02-25 21:50:20 +02:00
parent 04d07f836b
commit 22df735b5a
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/transaction.c
View File

@ -618,34 +618,20 @@ assert(otherFi != NULL);
* @param p current transaction element
* @param h installed header
* @param ps problem set
* @return 0 if not newer, 1 if okay
*/
static int ensureOlder(const rpmte p, const Header h, rpmps ps)
static void ensureOlder(const rpmte p, const Header h, rpmps ps)
{
rpmsenseFlags reqFlags = (RPMSENSE_LESS | RPMSENSE_EQUAL);
rpmds req;
int rc;
if (p == NULL || h == NULL)
return 1;
req = rpmdsSingle(RPMTAG_REQUIRENAME, rpmteN(p), rpmteEVR(p), reqFlags);
rc = rpmdsNVRMatchesDep(h, req, _rpmds_nopromote);
req = rpmdsFree(req);
if (rc == 0) {
if (rpmdsNVRMatchesDep(h, req, _rpmds_nopromote) == 0) {
char * altNEVR = headerGetAsString(h, RPMTAG_NEVRA);
rpmpsAppend(ps, RPMPROB_OLDPACKAGE,
rpmteNEVRA(p), rpmteKey(p),
NULL, NULL,
altNEVR,
0);
altNEVR = _free(altNEVR);
rc = 1;
} else
rc = 0;
return rc;
rpmpsAppend(ps, RPMPROB_OLDPACKAGE, rpmteNEVRA(p), rpmteKey(p),
NULL, NULL, altNEVR, 0);
free(altNEVR);
}
rpmdsFree(req);
}
/**