diff --git a/doc/libpkgconf-pkg.rst b/doc/libpkgconf-pkg.rst index 481ebb3..eec9251 100644 --- a/doc/libpkgconf-pkg.rst +++ b/doc/libpkgconf-pkg.rst @@ -5,14 +5,13 @@ libpkgconf `pkg` module The `pkg` module provides dependency resolution services and the overall `.pc` file parsing routines. -.. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags) +.. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client) - Bootstraps the package search paths. If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is provided, + Bootstraps the package search paths. If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client, then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used. :param pkgconf_client_t* client: The pkgconf client object to bootstrap. - :param uint flags: A set of dependency resolver options. :return: nothing .. c:function:: pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename, FILE *f) diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index bf162f1..3f13f1d 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -216,7 +216,7 @@ pkgconf_pkg_t *pkgconf_builtin_pkg_get(const char *name); int pkgconf_compare_version(const char *a, const char *b); pkgconf_pkg_t *pkgconf_scan_all(pkgconf_client_t *client, void *ptr, pkgconf_pkg_iteration_func_t func); -void pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags); +void pkgconf_pkg_dir_list_build(pkgconf_client_t *client); /* parse.c */ pkgconf_pkg_t *pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *path, FILE *f); diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c index d49cbe8..ebe4384 100644 --- a/libpkgconf/pkg.c +++ b/libpkgconf/pkg.c @@ -100,22 +100,21 @@ pkg_get_parent_dir(pkgconf_pkg_t *pkg) /* * !doc * - * .. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags) + * .. c:function:: void pkgconf_pkg_dir_list_build(pkgconf_client_t *client) * - * Bootstraps the package search paths. If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is provided, + * Bootstraps the package search paths. If the ``PKGCONF_PKG_PKGF_ENV_ONLY`` `flag` is set on the client, * then only the ``PKG_CONFIG_PATH`` environment variable will be used, otherwise both the * ``PKG_CONFIG_PATH`` and ``PKG_CONFIG_LIBDIR`` environment variables will be used. * * :param pkgconf_client_t* client: The pkgconf client object to bootstrap. - * :param uint flags: A set of dependency resolver options. * :return: nothing */ void -pkgconf_pkg_dir_list_build(pkgconf_client_t *client, unsigned int flags) +pkgconf_pkg_dir_list_build(pkgconf_client_t *client) { pkgconf_path_build_from_environ("PKG_CONFIG_PATH", NULL, &client->dir_list, true); - if (!(flags & PKGCONF_PKG_PKGF_ENV_ONLY)) + if (!(client->flags & PKGCONF_PKG_PKGF_ENV_ONLY)) pkgconf_path_build_from_environ("PKG_CONFIG_LIBDIR", get_default_pkgconfig_path(), &client->dir_list, true); } diff --git a/main.c b/main.c index 004861b..afb0653 100644 --- a/main.c +++ b/main.c @@ -813,7 +813,7 @@ main(int argc, char *argv[]) pkgconf_client_set_flags(&pkg_client, want_client_flags); /* at this point, want_client_flags should be set, so build the dir list */ - pkgconf_pkg_dir_list_build(&pkg_client, want_client_flags); + pkgconf_pkg_dir_list_build(&pkg_client); if (required_pkgconfig_version != NULL) {