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

libpkgconf: client: bring up the default trace handler as early as possible

pull/116/head
William Pitcock 2017-02-04 20:09:21 -06:00
parent f7f0bfc460
commit 16ecf82fd7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libpkgconf/client.c
View File

@ -62,14 +62,15 @@ pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error
client->error_handler = error_handler; client->error_handler = error_handler;
client->auditf = NULL; client->auditf = NULL;
pkgconf_client_set_sysroot_dir(client, NULL); if (client->trace_handler == NULL)
pkgconf_client_set_buildroot_dir(client, NULL); pkgconf_client_set_trace_handler(client, NULL, NULL);
pkgconf_client_set_prefix_varname(client, NULL);
pkgconf_client_set_error_handler(client, error_handler, error_handler_data); pkgconf_client_set_error_handler(client, error_handler, error_handler_data);
pkgconf_client_set_warn_handler(client, NULL, NULL); pkgconf_client_set_warn_handler(client, NULL, NULL);
if (client->trace_handler == NULL)
pkgconf_client_set_trace_handler(client, NULL, NULL); pkgconf_client_set_sysroot_dir(client, NULL);
pkgconf_client_set_buildroot_dir(client, NULL);
pkgconf_client_set_prefix_varname(client, NULL);
pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", SYSTEM_LIBDIR, &client->filter_libdirs, false); pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", SYSTEM_LIBDIR, &client->filter_libdirs, false);
pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR, &client->filter_includedirs, false); pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR, &client->filter_includedirs, false);
@ -547,7 +548,7 @@ pkgconf_client_set_trace_handler(pkgconf_client_t *client, pkgconf_error_handler
if (client->trace_handler == NULL) if (client->trace_handler == NULL)
{ {
PKGCONF_TRACE(client, "installing default trace handler");
client->trace_handler = pkgconf_default_error_handler; client->trace_handler = pkgconf_default_error_handler;
PKGCONF_TRACE(client, "installing default trace handler");
} }
} }