Rename symbols leaking from static library to avoid name clashes

The static library currently leaks log_msg and log_priority. Both are too
generic, so rename them, with a leading underscore to hint they're supposed to
be private.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h
index c184434f8fab2707faa30dca7ebb0c9912b32462..5e5ab2610544677f4aae98b84c7093639c0cea0c 100644 (file)
--- a/libevdev/libevdev-int.h
+++ b/libevdev/libevdev-int.h
@@ -126,8 +126,8 @@ struct libevdev {
 
 #define log_msg_cond(dev, priority, ...) \
        do { \
-               if (log_priority(dev) >= priority) \
-                       log_msg(dev, priority, __FILE__, __LINE__, __func__, __VA_ARGS__); \
+               if (_libevdev_log_priority(dev) >= priority) \
+                       _libevdev_log_msg(dev, priority, __FILE__, __LINE__, __func__, __VA_ARGS__); \
        } while(0)
 
 #define log_error(dev, ...) log_msg_cond(dev, LIBEVDEV_LOG_ERROR, __VA_ARGS__)
@@ -136,12 +136,12 @@ struct libevdev {
 #define log_bug(dev, ...) log_msg_cond(dev, LIBEVDEV_LOG_ERROR, "BUG: "__VA_ARGS__)
 
 extern void
-log_msg(const struct libevdev *dev,
-       enum libevdev_log_priority priority,
-       const char *file, int line, const char *func,
-       const char *format, ...) LIBEVDEV_ATTRIBUTE_PRINTF(6, 7);
+_libevdev_log_msg(const struct libevdev *dev,
+                 enum libevdev_log_priority priority,
+                 const char *file, int line, const char *func,
+                 const char *format, ...) LIBEVDEV_ATTRIBUTE_PRINTF(6, 7);
 extern enum libevdev_log_priority
-log_priority(const struct libevdev *dev);
+_libevdev_log_priority(const struct libevdev *dev);
 
 /**
  * @return a pointer to the next element in the queue, or NULL if the queue

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index 903a2866fd065441d49d1f2867455baf60951d03..6831e68e843bf10d860fdefe1e38d7d37d22c555 100644 (file)
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -136,10 +136,10 @@ static struct logdata log_data = {
 };
 
 void
-log_msg(const struct libevdev *dev,
-       enum libevdev_log_priority priority,
-       const char *file, int line, const char *func,
-       const char *format, ...)
+_libevdev_log_msg(const struct libevdev *dev,
+                 enum libevdev_log_priority priority,
+                 const char *file, int line, const char *func,
+                 const char *format, ...)
 {
        va_list args;
 
@@ -275,7 +275,7 @@ libevdev_set_device_log_function(struct libevdev *dev,
 }
 
 enum libevdev_log_priority
-log_priority(const struct libevdev *dev)
+_libevdev_log_priority(const struct libevdev *dev)
 {
        if (dev && dev->log.device_handler)
                return dev->log.priority;