From f5d6bb71f84ff8acdea0eb08f6bd41b5c8acc1f0 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 4 Feb 2022 16:06:08 -0800 Subject: [PATCH] libpkgconf: remove const modifier from error_handler data pointer Currently, the data pointer is `const void *`, which means that the handler can't modify the data without casting away the constness. --- cli/main.c | 2 +- libpkgconf/client.c | 2 +- libpkgconf/libpkgconf.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/main.c b/cli/main.c index 486154d..1b09146 100644 --- a/cli/main.c +++ b/cli/main.c @@ -85,7 +85,7 @@ FILE *error_msgout = NULL; FILE *logfile_out = NULL; static bool -error_handler(const char *msg, const pkgconf_client_t *client, const void *data) +error_handler(const char *msg, const pkgconf_client_t *client, void *data) { (void) client; (void) data; diff --git a/libpkgconf/client.c b/libpkgconf/client.c index 5cf60c9..05f24ec 100644 --- a/libpkgconf/client.c +++ b/libpkgconf/client.c @@ -401,7 +401,7 @@ pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t linen * :rtype: bool */ bool -pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data) +pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data) { (void) msg; (void) client; diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index c235ac8..8036946 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -167,7 +167,7 @@ struct pkgconf_pkg_ { typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data); typedef void (*pkgconf_pkg_traverse_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data); typedef bool (*pkgconf_queue_apply_func_t)(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int maxdepth); -typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, const void *data); +typedef bool (*pkgconf_error_handler_func_t)(const char *msg, const pkgconf_client_t *client, void *data); struct pkgconf_client_ { pkgconf_list_t dir_list; @@ -289,7 +289,7 @@ PKGCONF_API void pkgconf_parser_parse(FILE *f, void *data, const pkgconf_parser_ PKGCONF_API bool pkgconf_error(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3); PKGCONF_API bool pkgconf_warn(const pkgconf_client_t *client, const char *format, ...) PRINTFLIKE(2, 3); PKGCONF_API bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t lineno, const char *funcname, const char *format, ...) PRINTFLIKE(5, 6); -PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data); +PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, void *data); #ifndef PKGCONF_LITE #if defined(__GNUC__) || defined(__INTEL_COMPILER)