Mesa (master): loader: deduplicate logger function declaration
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 4 16:35:16 UTC 2018
Module: Mesa
Branch: master
Commit: 95d62baac5daf39fc76bdffa600ffa2d5e36b25f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95d62baac5daf39fc76bdffa600ffa2d5e36b25f
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Fri Nov 16 12:26:17 2018 +0000
loader: deduplicate logger function declaration
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/loader/loader.c | 4 ++--
src/loader/loader.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/loader/loader.c b/src/loader/loader.c
index 05140b6d18..0f799c14fd 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -68,7 +68,7 @@ static void default_logger(int level, const char *fmt, ...)
}
}
-static void (*log_)(int level, const char *fmt, ...) = default_logger;
+static loader_logger *log_ = default_logger;
int
loader_open_device(const char *device_name)
@@ -491,7 +491,7 @@ out:
}
void
-loader_set_logger(void (*logger)(int level, const char *fmt, ...))
+loader_set_logger(loader_logger *logger)
{
log_ = logger;
}
diff --git a/src/loader/loader.h b/src/loader/loader.h
index 779ec44b75..d063ab3f6c 100644
--- a/src/loader/loader.h
+++ b/src/loader/loader.h
@@ -74,8 +74,9 @@ loader_get_user_preferred_fd(int default_fd, bool *different_device);
#define _LOADER_INFO 2 /* just useful info */
#define _LOADER_DEBUG 3 /* useful info for debugging */
+typedef void loader_logger(int level, const char *fmt, ...);
void
-loader_set_logger(void (*logger)(int level, const char *fmt, ...));
+loader_set_logger(loader_logger *logger);
char *
loader_get_extensions_name(const char *driver_name);
More information about the mesa-commit
mailing list