fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-24 17:00:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename symbols leaking from static library to avoid name clashes

Browse source 
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>
This commit is contained in:
Peter Hutterer 2014-08-18 14:03:43 +10:00
parent 8742e1e346
commit e4c315fc16
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libevdev/libevdev-int.h
View file

@ -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

10
libevdev/libevdev.c
View file

@ -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;