From f4453d104dcf0742af0949225cada72a6cc65d05 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 21 Jun 2017 12:10:07 -0400 Subject: Reorganize wlr-common --- include/backend/drm.h | 2 +- include/backend/libinput.h | 4 ++-- include/backend/multi.h | 2 +- include/backend/wayland.h | 2 +- include/common/log.h | 27 --------------------------- include/wlr/common/list.h | 31 ------------------------------- include/wlr/common/log.h | 19 ------------------- include/wlr/types/wlr_output.h | 2 +- include/wlr/util/list.h | 31 +++++++++++++++++++++++++++++++ include/wlr/util/log.h | 39 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 76 insertions(+), 83 deletions(-) delete mode 100644 include/common/log.h delete mode 100644 include/wlr/common/list.h delete mode 100644 include/wlr/common/log.h create mode 100644 include/wlr/util/list.h create mode 100644 include/wlr/util/log.h (limited to 'include') diff --git a/include/backend/drm.h b/include/backend/drm.h index a4995fa9..2c78e3d9 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -11,8 +11,8 @@ #include #include -#include #include +#include #include "backend/egl.h" #include "backend/udev.h" diff --git a/include/backend/libinput.h b/include/backend/libinput.h index f424053a..bb83c749 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -1,10 +1,10 @@ #ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H #define _WLR_BACKEND_LIBINPUT_INTERNAL_H #include -#include -#include #include +#include #include +#include #include "backend/udev.h" struct wlr_backend_state { diff --git a/include/backend/multi.h b/include/backend/multi.h index 5e6930bb..efaf61b9 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -3,7 +3,7 @@ #include #include -#include +#include struct wlr_backend_state { struct wlr_backend *backend; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 02ea3482..bf65ec50 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -4,9 +4,9 @@ #include #include #include -#include #include #include +#include #include "backend/egl.h" struct wlr_backend_state { diff --git a/include/common/log.h b/include/common/log.h deleted file mode 100644 index 98e57900..00000000 --- a/include/common/log.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _WLR_INTERNAL_COMMON_LOG_H -#define _WLR_INTERNAL_COMMON_LOG_H -#include -#include -#include -#include - -#ifdef __GNUC__ -#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) -#else -#define ATTRIB_PRINTF(start, end) -#endif - -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); - -#define wlr_log(verb, fmt, ...) \ - _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) - -#define wlr_vlog(verb, fmt, args) \ - _wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args) - -#define wlr_log_errno(verb, fmt, ...) \ - wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) - -#endif diff --git a/include/wlr/common/list.h b/include/wlr/common/list.h deleted file mode 100644 index 2bc82570..00000000 --- a/include/wlr/common/list.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _WLR_LIST_H -#define _WLR_LIST_H - -#include - -typedef struct { - size_t capacity; - size_t length; - void **items; -} list_t; - -list_t *list_create(void); -void list_free(list_t *list); -void list_foreach(list_t *list, void (*callback)(void* item)); -void list_add(list_t *list, void *item); -void list_push(list_t *list, void *item); -void list_insert(list_t *list, size_t index, void *item); -void list_del(list_t *list, size_t index); -void *list_pop(list_t *list); -void *list_peek(list_t *list); -void list_cat(list_t *list, list_t *source); -// See qsort. Remember to use *_qsort functions as compare functions, -// because they dereference the left and right arguments first! -void list_qsort(list_t *list, int compare(const void *left, const void *right)); -// Return index for first item in list that returns 0 for given compare -// function or -1 if none matches. -int list_seq_find(list_t *list, - int compare(const void *item, const void *cmp_to), - const void *cmp_to); - -#endif diff --git a/include/wlr/common/log.h b/include/wlr/common/log.h deleted file mode 100644 index c93f9652..00000000 --- a/include/wlr/common/log.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _WLR_COMMON_LOG_H -#define _WLR_COMMON_LOG_H -#include -#include - -typedef enum { - L_SILENT = 0, - L_ERROR = 1, - L_INFO = 2, - L_DEBUG = 3, - L_LAST, -} log_importance_t; - -typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args); - -void wlr_init_log(log_callback_t callback); -void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args); - -#endif diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 66216d3e..8ccf87e1 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -1,7 +1,7 @@ #ifndef _WLR_TYPES_OUTPUT_H #define _WLR_TYPES_OUTPUT_H #include -#include +#include #include struct wlr_output_mode_state; diff --git a/include/wlr/util/list.h b/include/wlr/util/list.h new file mode 100644 index 00000000..c82fbf7a --- /dev/null +++ b/include/wlr/util/list.h @@ -0,0 +1,31 @@ +#ifndef _WLR_UTIL_LIST_H +#define _WLR_UTIL_LIST_H + +#include + +typedef struct { + size_t capacity; + size_t length; + void **items; +} list_t; + +list_t *list_create(void); +void list_free(list_t *list); +void list_foreach(list_t *list, void (*callback)(void* item)); +void list_add(list_t *list, void *item); +void list_push(list_t *list, void *item); +void list_insert(list_t *list, size_t index, void *item); +void list_del(list_t *list, size_t index); +void *list_pop(list_t *list); +void *list_peek(list_t *list); +void list_cat(list_t *list, list_t *source); +// See qsort. Remember to use *_qsort functions as compare functions, +// because they dereference the left and right arguments first! +void list_qsort(list_t *list, int compare(const void *left, const void *right)); +// Return index for first item in list that returns 0 for given compare +// function or -1 if none matches. +int list_seq_find(list_t *list, + int compare(const void *item, const void *cmp_to), + const void *cmp_to); + +#endif diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h new file mode 100644 index 00000000..2acaa2ed --- /dev/null +++ b/include/wlr/util/log.h @@ -0,0 +1,39 @@ +#ifndef _WLR_UTIL_LOG_H +#define _WLR_UTIL_LOG_H +#include +#include +#include +#include + +typedef enum { + L_SILENT = 0, + L_ERROR = 1, + L_INFO = 2, + L_DEBUG = 3, + L_LAST, +} log_importance_t; + +typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args); + +void wlr_init_log(log_callback_t callback); + +#ifdef __GNUC__ +#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) +#else +#define ATTRIB_PRINTF(start, end) +#endif + +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); + +#define wlr_log(verb, fmt, ...) \ + _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + +#define wlr_vlog(verb, fmt, args) \ + _wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args) + +#define wlr_log_errno(verb, fmt, ...) \ + wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) + +#endif -- cgit v1.2.3