ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

pkg: make pkgconf_vercmp_res_func_t more generic, allowing it to be used for Provides rules.

pull/100/head
William Pitcock 2016-09-08 23:23:15 -05:00
parent ef545a017e
commit 9783181cce
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libpkgconf/pkg.c
View File

@ -775,7 +775,7 @@ pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name)
return (pair != NULL) ? pair->pkg : NULL; return (pair != NULL) ? pair->pkg : NULL;
} }
typedef bool (*pkgconf_vercmp_res_func_t)(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep); typedef bool (*pkgconf_vercmp_res_func_t)(const char *a, const char *b);
typedef struct { typedef struct {
const char *name; const char *name;
@ -798,40 +798,40 @@ static int pkgconf_pkg_comparator_pair_namecmp(const void *key, const void *ptr)
return strcmp(key, pair->name); return strcmp(key, pair->name);
} }
static bool pkgconf_pkg_comparator_lt(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_lt(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) < 0); return (pkgconf_compare_version(a, b) < 0);
} }
static bool pkgconf_pkg_comparator_gt(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_gt(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) > 0); return (pkgconf_compare_version(a, b) > 0);
} }
static bool pkgconf_pkg_comparator_lte(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_lte(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) <= 0); return (pkgconf_compare_version(a, b) <= 0);
} }
static bool pkgconf_pkg_comparator_gte(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_gte(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) >= 0); return (pkgconf_compare_version(a, b) >= 0);
} }
static bool pkgconf_pkg_comparator_eq(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_eq(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) == 0); return (pkgconf_compare_version(a, b) == 0);
} }
static bool pkgconf_pkg_comparator_ne(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_ne(const char *a, const char *b)
{ {
return (pkgconf_compare_version(pkg->version, pkgdep->version) != 0); return (pkgconf_compare_version(a, b) != 0);
} }
static bool pkgconf_pkg_comparator_any(pkgconf_pkg_t *pkg, pkgconf_dependency_t *pkgdep) static bool pkgconf_pkg_comparator_any(const char *a, const char *b)
{ {
(void) pkg; (void) a;
(void) pkgdep; (void) b;
return true; return true;
} }
@ -966,7 +966,7 @@ pkgconf_pkg_verify_dependency(pkgconf_dependency_t *pkgdep, unsigned int flags,
if (pkg->id == NULL) if (pkg->id == NULL)
pkg->id = strdup(pkgdep->package); pkg->id = strdup(pkgdep->package);
if (pkgconf_pkg_comparator_impls[pkgdep->compare](pkg, pkgdep) == true) if (pkgconf_pkg_comparator_impls[pkgdep->compare](pkg->version, pkgdep->version) == true)
return pkg; return pkg;
if (eflags != NULL) if (eflags != NULL)