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

libpkgconf: migrate pkgconf_error() to use client objects

pull/100/head
William Pitcock 2016-12-01 15:09:54 -06:00
parent 8740c5cd55
commit 434c465ca9
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkgconf/libpkgconf.h
View File

@ -185,9 +185,8 @@ void pkgconf_client_free(pkgconf_client_t *client);
#define DEPRECATED #define DEPRECATED
#endif /* defined(__INTEL_COMPILER) || defined(__GNUC__) */ #endif /* defined(__INTEL_COMPILER) || defined(__GNUC__) */
bool pkgconf_error(const char *format, ...) PRINTFLIKE(1, 2); bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3);
bool pkgconf_default_error_handler(const char *msg); bool pkgconf_default_error_handler(const char *msg);
void pkgconf_set_error_handler(pkgconf_error_handler_func_t func);
pkgconf_pkg_t *pkgconf_pkg_ref(pkgconf_pkg_t *pkg); pkgconf_pkg_t *pkgconf_pkg_ref(pkgconf_pkg_t *pkg);
void pkgconf_pkg_unref(pkgconf_pkg_t *pkg); void pkgconf_pkg_unref(pkgconf_pkg_t *pkg);

34
libpkgconf/pkg.c
View File

@ -15,10 +15,8 @@
#include <libpkgconf/libpkgconf.h> #include <libpkgconf/libpkgconf.h>
static pkgconf_error_handler_func_t pkgconf_error_handler = pkgconf_default_error_handler;
bool bool
pkgconf_error(const char *format, ...) pkgconf_error(const pkgconf_client_t *client, const char *format, ...)
{ {
char errbuf[PKGCONF_BUFSIZE]; char errbuf[PKGCONF_BUFSIZE];
va_list va; va_list va;
@ -27,7 +25,7 @@ pkgconf_error(const char *format, ...)
vsnprintf(errbuf, sizeof errbuf, format, va); vsnprintf(errbuf, sizeof errbuf, format, va);
va_end(va); va_end(va);
return pkgconf_error_handler(errbuf); return client->error_handler(errbuf);
} }
bool bool
@ -38,12 +36,6 @@ pkgconf_default_error_handler(const char *msg)
return true; return true;
} }
void
pkgconf_set_error_handler(pkgconf_error_handler_func_t func)
{
pkgconf_error_handler = func;
}
#ifdef _WIN32 #ifdef _WIN32
# define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH" # define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH"
# undef PKG_DEFAULT_PATH # undef PKG_DEFAULT_PATH
@ -1043,7 +1035,7 @@ pkgconf_pkg_verify_graph(const pkgconf_client_t *client, pkgconf_pkg_t *root, in
} }
static unsigned int static unsigned int
pkgconf_pkg_report_graph_error(pkgconf_pkg_t *parent, pkgconf_pkg_t *pkg, pkgconf_dependency_t *node, unsigned int eflags) pkgconf_pkg_report_graph_error(const pkgconf_client_t *client, pkgconf_pkg_t *parent, pkgconf_pkg_t *pkg, pkgconf_dependency_t *node, unsigned int eflags)
{ {
static bool already_sent_notice = false; static bool already_sent_notice = false;
@ -1051,22 +1043,22 @@ pkgconf_pkg_report_graph_error(pkgconf_pkg_t *parent, pkgconf_pkg_t *pkg, pkgcon
{ {
if (!already_sent_notice) if (!already_sent_notice)
{ {
pkgconf_error("Package %s was not found in the pkg-config search path.\n", node->package); pkgconf_error(client, "Package %s was not found in the pkg-config search path.\n", node->package);
pkgconf_error("Perhaps you should add the directory containing `%s.pc'\n", node->package); pkgconf_error(client, "Perhaps you should add the directory containing `%s.pc'\n", node->package);
pkgconf_error("to the PKG_CONFIG_PATH environment variable\n"); pkgconf_error(client, "to the PKG_CONFIG_PATH environment variable\n");
already_sent_notice = true; already_sent_notice = true;
} }
pkgconf_error("Package '%s', required by '%s', not found\n", node->package, parent->id); pkgconf_error(client, "Package '%s', required by '%s', not found\n", node->package, parent->id);
pkgconf_audit_log("%s NOT-FOUND\n", node->package); pkgconf_audit_log("%s NOT-FOUND\n", node->package);
} }
else if (eflags & PKGCONF_PKG_ERRF_PACKAGE_VER_MISMATCH) else if (eflags & PKGCONF_PKG_ERRF_PACKAGE_VER_MISMATCH)
{ {
pkgconf_error("Package dependency requirement '%s %s %s' could not be satisfied.\n", pkgconf_error(client, "Package dependency requirement '%s %s %s' could not be satisfied.\n",
node->package, pkgconf_pkg_get_comparator(node), node->version); node->package, pkgconf_pkg_get_comparator(node), node->version);
if (pkg != NULL) if (pkg != NULL)
pkgconf_error("Package '%s' has version '%s', required version is '%s %s'\n", pkgconf_error(client, "Package '%s' has version '%s', required version is '%s %s'\n",
node->package, pkg->version, pkgconf_pkg_get_comparator(node), node->version); node->package, pkg->version, pkgconf_pkg_get_comparator(node), node->version);
} }
@ -1102,7 +1094,7 @@ pkgconf_pkg_walk_list(const pkgconf_client_t *client,
eflags |= eflags_local; eflags |= eflags_local;
if (eflags_local != PKGCONF_PKG_ERRF_OK && !(flags & PKGCONF_PKG_PKGF_SKIP_ERRORS)) if (eflags_local != PKGCONF_PKG_ERRF_OK && !(flags & PKGCONF_PKG_PKGF_SKIP_ERRORS))
{ {
pkgconf_pkg_report_graph_error(parent, pkgdep, depnode, eflags_local); pkgconf_pkg_report_graph_error(client, parent, pkgdep, depnode, eflags_local);
continue; continue;
} }
if (pkgdep == NULL) if (pkgdep == NULL)
@ -1150,11 +1142,11 @@ pkgconf_pkg_walk_conflicts_list(const pkgconf_client_t *client,
pkgdep = pkgconf_pkg_verify_dependency(client, parentnode, flags, &eflags); pkgdep = pkgconf_pkg_verify_dependency(client, parentnode, flags, &eflags);
if (eflags == PKGCONF_PKG_ERRF_OK) if (eflags == PKGCONF_PKG_ERRF_OK)
{ {
pkgconf_error("Version '%s' of '%s' conflicts with '%s' due to satisfying conflict rule '%s %s%s%s'.\n", pkgconf_error(client, "Version '%s' of '%s' conflicts with '%s' due to satisfying conflict rule '%s %s%s%s'.\n",
pkgdep->version, pkgdep->realname, root->realname, parentnode->package, pkgconf_pkg_get_comparator(parentnode), pkgdep->version, pkgdep->realname, root->realname, parentnode->package, pkgconf_pkg_get_comparator(parentnode),
parentnode->version != NULL ? " " : "", parentnode->version != NULL ? parentnode->version : ""); parentnode->version != NULL ? " " : "", parentnode->version != NULL ? parentnode->version : "");
pkgconf_error("It may be possible to ignore this conflict and continue, try the\n"); pkgconf_error(client, "It may be possible to ignore this conflict and continue, try the\n");
pkgconf_error("PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n"); pkgconf_error(client, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n");
pkgconf_pkg_unref(pkgdep); pkgconf_pkg_unref(pkgdep);