bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move alpm_find_dbs_satisfier() function down in deps.c

Browse source 
This will make sense for a later commit when static/non-static
properties of other functions are changed.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-03-25 14:38:39 -05:00
parent c40fc6b80d
commit 5a9a570dda
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/libalpm/deps.c
View file

@ -526,28 +526,6 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit)
} }
} }
/** Find a package satisfying a specified dependency.
* First look for a literal, going through each db one by one. Then look for
* providers. The first satisfier found is returned.
* The dependency can include versions with depmod operators.
* @param dbs an alpm_list_t* of pmdb_t where the satisfier will be searched
* @param depstring package or provision name, versioned or not
* @return a pmpkg_t* satisfying depstring
*/
pmpkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_list_t *dbs, const char *depstring)
{
pmdepend_t *dep;
pmpkg_t *pkg;
ASSERT(dbs, return(NULL));
dep = _alpm_splitdep(depstring);
ASSERT(dep, return(NULL));
pkg = _alpm_resolvedep(dep, dbs, NULL, 1);
_alpm_dep_free(dep);
return(pkg);
}
/** /**
* helper function for resolvedeps: search for dep satisfier in dbs * helper function for resolvedeps: search for dep satisfier in dbs
* *
@ -650,7 +628,30 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
return(NULL); return(NULL);
} }
/* Computes resolvable dependencies for a given package and adds that package /** Find a package satisfying a specified dependency.
* First look for a literal, going through each db one by one. Then look for
* providers. The first satisfier found is returned.
* The dependency can include versions with depmod operators.
* @param dbs an alpm_list_t* of pmdb_t where the satisfier will be searched
* @param depstring package or provision name, versioned or not
* @return a pmpkg_t* satisfying depstring
*/
pmpkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_list_t *dbs, const char *depstring)
{
pmdepend_t *dep;
pmpkg_t *pkg;
ASSERT(dbs, return(NULL));
dep = _alpm_splitdep(depstring);
ASSERT(dep, return(NULL));
pkg = _alpm_resolvedep(dep, dbs, NULL, 1);
_alpm_dep_free(dep);
return(pkg);
}
/**
* Computes resolvable dependencies for a given package and adds that package
* and those resolvable dependencies to a list. * and those resolvable dependencies to a list.
* *
* @param localpkgs is the list of local packages * @param localpkgs is the list of local packages