aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2018-02-21 10:22:58 +0100
committerGuido Günther <agx@sigxcpu.org>2018-02-21 10:25:52 +0100
commit2688f6163f5cce95302bb40ae35ff855ee1ccb1d (patch)
tree5fd6618ac30c81834ae3c4a9a1cfb71a0ed8765e
parent2e7d8862549a786c5aafcbe20db290377e3228ac (diff)
Rename _strip_path to wlr_strip_path
since it's a public function
-rw-r--r--include/render/gles2.h2
-rw-r--r--include/wlr/util/log.h6
-rw-r--r--util/log.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 797c5293..e015160d 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -62,7 +62,7 @@ extern const GLchar fragment_src_external[];
bool _gles2_flush_errors(const char *file, int line);
#define gles2_flush_errors(...) \
- _gles2_flush_errors(_strip_path(__FILE__), __LINE__)
+ _gles2_flush_errors(wlr_strip_path(__FILE__), __LINE__)
#define GL_CALL(func) func; gles2_flush_errors()
diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h
index 3d3f25f9..5528664b 100644
--- a/include/wlr/util/log.h
+++ b/include/wlr/util/log.h
@@ -28,13 +28,13 @@ void wlr_log_init(log_importance_t verbosity, log_callback_t callback);
void _wlr_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3);
void _wlr_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0);
-const char *_strip_path(const char *filepath);
+const char *wlr_strip_path(const char *filepath);
#define wlr_log(verb, fmt, ...) \
- _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
+ _wlr_log(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
#define wlr_vlog(verb, fmt, args) \
- _wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args)
+ _wlr_vlog(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, args)
#define wlr_log_errno(verb, fmt, ...) \
wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno))
diff --git a/util/log.c b/util/log.c
index 327402e6..2adcae2d 100644
--- a/util/log.c
+++ b/util/log.c
@@ -73,7 +73,7 @@ void _wlr_log(log_importance_t verbosity, const char *fmt, ...) {
// e.g. '/src/build/wlroots/backend/wayland/backend.c' and
// '../backend/wayland/backend.c' will both be stripped to
// 'backend/wayland/backend.c'
-const char *_strip_path(const char *filepath) {
+const char *wlr_strip_path(const char *filepath) {
static int srclen = sizeof(WLR_SRC_DIR);
if (strstr(filepath, WLR_SRC_DIR) == filepath) {
filepath += srclen;