libweston: Remove internal weston-log set-up function out of public header

We have dedicated header for the internal parts of the logging
framework, use that for the set-up part instead of the libweston public
API header.

Further more this removes weston_vlog() from public header as well and
moves them to weston-log-internal.h file.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
dev
Marius Vlad 5 years ago
parent e2d2ab7ed5
commit 4e03629f44
  1. 8
      include/libweston/libweston.h
  2. 2
      libweston/compositor.c
  3. 1
      libweston/libinput-seat.c
  4. 8
      libweston/weston-log-internal.h

@ -1816,10 +1816,6 @@ typedef int (*log_func_t)(const char *fmt, va_list ap);
void void
weston_log_set_handler(log_func_t log, log_func_t cont); weston_log_set_handler(log_func_t log, log_func_t cont);
int int
weston_vlog(const char *fmt, va_list ap);
int
weston_vlog_continue(const char *fmt, va_list ap);
int
weston_log(const char *fmt, ...) weston_log(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
int int
@ -2037,10 +2033,6 @@ weston_compositor_enable_touch_calibrator(struct weston_compositor *compositor,
struct weston_log_context * struct weston_log_context *
weston_log_ctx_compositor_create(void); weston_log_ctx_compositor_create(void);
int
weston_log_ctx_compositor_setup(struct weston_compositor *compositor,
struct weston_log_context *log_ctx);
void void
weston_log_ctx_compositor_destroy(struct weston_compositor *compositor); weston_log_ctx_compositor_destroy(struct weston_compositor *compositor);

@ -75,6 +75,8 @@
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "weston-log-internal.h"
/** /**
* \defgroup head Head * \defgroup head Head
* \defgroup output Output * \defgroup output Output

@ -37,6 +37,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "weston-log-internal.h"
#include "launcher-util.h" #include "launcher-util.h"
#include "libinput-seat.h" #include "libinput-seat.h"
#include "libinput-device.h" #include "libinput-device.h"

@ -93,5 +93,13 @@ weston_log_run_cb_new_subscriber(struct weston_log_subscription *sub);
void void
weston_debug_protocol_advertise_scopes(struct weston_log_context *log_ctx, weston_debug_protocol_advertise_scopes(struct weston_log_context *log_ctx,
struct wl_resource *res); struct wl_resource *res);
int
weston_log_ctx_compositor_setup(struct weston_compositor *compositor,
struct weston_log_context *log_ctx);
int
weston_vlog(const char *fmt, va_list ap);
int
weston_vlog_continue(const char *fmt, va_list ap);
#endif /* WESTON_LOG_INTERNAL_H */ #endif /* WESTON_LOG_INTERNAL_H */

Loading…
Cancel
Save