sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

al.c: removed extra arguments in alAllSatisfiesDepend

Browse Source
This commit is contained in:
Alexey Tourbin 2009-10-04 10:37:27 +04:00
parent ffeac246e1
commit 09751027bf
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/al.c
View File

@ -286,7 +286,6 @@ void alFreeDirIndex(availableList al)
struct availablePackage **
alAllSatisfiesDepend(const availableList al,
const char * keyType, const char * keyDepend,
const char * keyName, const char * keyEVR, int keyFlags)
{
struct availablePackage ** ret = NULL;
@ -305,9 +304,6 @@ alAllSatisfiesDepend(const availableList al,
}
if (already)
continue;
if (keyType)
rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"),
keyType, keyName);
ret = xrealloc(ret, (found + 2) * sizeof(*ret));
ret[found++] = alp;
}
@ -334,9 +330,6 @@ alAllSatisfiesDepend(const availableList al,
keyName, keyEVR, keyFlags);
if (rc == 0)
continue;
if (keyType && keyDepend)
rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
keyType, keyDepend+2);
ret = xrealloc(ret, (found + 2) * sizeof(*ret));
ret[found++] = alp;
}

8
lib/al.h
View File

@ -40,8 +40,6 @@ alAddPackage(availableList al,
/**
* Check added package file lists for package(s) that have a provide.
* @param al available list
* @param keyType type of dependency
* @param keyDepend dependency string representation
* @param keyName dependency name string
* @param keyEVR dependency [epoch:]version[-release] string
* @param keyFlags dependency logical range qualifiers
@ -49,7 +47,6 @@ alAddPackage(availableList al,
*/
/*@only@*/ /*@null@*/ struct availablePackage **
alAllSatisfiesDepend(const availableList al,
const char * keyType, const char * keyDepend,
const char * keyName, const char * keyEVR, int keyFlags)
/*@*/;
@ -57,8 +54,6 @@ alAllSatisfiesDepend(const availableList al,
* Check added package file lists for first package that has a provide.
* @todo Eliminate.
* @param al available list
* @param keyType type of dependency
* @param keyDepend dependency string representation
* @param keyName dependency name string
* @param keyEVR dependency [epoch:]version[-release] string
* @param keyFlags dependency logical range qualifiers
@ -66,13 +61,12 @@ alAllSatisfiesDepend(const availableList al,
*/
static inline /*@only@*/ /*@null@*/ struct availablePackage *
alSatisfiesDepend(const availableList al,
const char * keyType, const char * keyDepend,
const char * keyName, const char * keyEVR, int keyFlags)
/*@*/
{
struct availablePackage * ret;
struct availablePackage ** tmp =
alAllSatisfiesDepend(al, keyType, keyDepend, keyName, keyEVR, keyFlags);
alAllSatisfiesDepend(al, keyName, keyEVR, keyFlags);
if (tmp) {
ret = tmp[0];

8
lib/depends.c
View File

@ -581,9 +581,11 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
goto unsatisfied;
}
if (alSatisfiesDepend(&ts->addedPackages, keyType, keyDepend,
keyName, keyEVR, keyFlags))
if (alSatisfiesDepend(&ts->addedPackages, keyName, keyEVR, keyFlags))
{
/* XXX here we do not discern between files and provides */
rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
keyType, keyDepend+2);
goto exit;
}
@ -1098,7 +1100,7 @@ static inline int addRelation( const rpmTransactionSet ts,
if (!p->requires || !p->requiresEVR || !p->requireFlags)
return 0;
q = alSatisfiesDepend(&ts->addedPackages, NULL, NULL,
q = alSatisfiesDepend(&ts->addedPackages,
p->requires[j], p->requiresEVR[j], p->requireFlags[j]);
/* Ordering depends only on added package relations. */