Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-25 14:38:39 -0500
committerDan McGee <dan@archlinux.org>2011-03-25 15:40:12 -0500
commit5a9a570dda81148fd9ce8ea46b3c57befa8535fe (patch)
tree34ae64128d86a268f5c120e3e280137c19b58690 /lib/libalpm
parentc40fc6b80d4a97e3333afab6d2ce8290aaa29c46 (diff)
Move alpm_find_dbs_satisfier() function down in deps.c
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>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/deps.c47
1 files changed, 24 insertions, 23 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 4e6d98d0..1f1e637f 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -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
*
@@ -650,7 +628,30 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
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.
*
* @param localpkgs is the list of local packages