3d5d9476e3
The main idea is to make libweston users use the form #include <libweston/libweston.h> instead of the plain #include <compositor.h> which is prone to name conflicts. This is reflected both in the installed files, and the internal header search paths so that Weston would use the exact same form as an external project using libweston would. The public headers are moved under a new top-level directory include/ to make them clearly stand out as special (public API). Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
119 lines
3.3 KiB
C
119 lines
3.3 KiB
C
/*
|
|
* Copyright © 2012 Martin Minarik
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/time.h>
|
|
#include <time.h>
|
|
|
|
#include <wayland-util.h>
|
|
|
|
#include <libweston/libweston.h>
|
|
|
|
static int
|
|
default_log_handler(const char *fmt, va_list ap);
|
|
|
|
static log_func_t log_handler = default_log_handler;
|
|
static log_func_t log_continue_handler = default_log_handler;
|
|
|
|
/** Sentinel log message handler
|
|
*
|
|
* This function is used as the default handler for log messages. It
|
|
* exists only to issue a noisy reminder to the user that a real handler
|
|
* must be installed prior to issuing logging calls. The process is
|
|
* immediately aborted after the reminder is printed.
|
|
*
|
|
* \param fmt The format string. Ignored.
|
|
* \param va The variadic argument list. Ignored.
|
|
*/
|
|
static int
|
|
default_log_handler(const char *fmt, va_list ap)
|
|
{
|
|
fprintf(stderr, "weston_log_set_handler() must be called before using of weston_log().\n");
|
|
abort();
|
|
}
|
|
|
|
/** Install the log handler
|
|
*
|
|
* The given functions will be called to output text as passed to the
|
|
* \a weston_log and \a weston_log_continue functions.
|
|
*
|
|
* \param log The log function. This function will be called when
|
|
* \a weston_log is called, and should begin a new line,
|
|
* with user defined line headers, if any.
|
|
* \param cont The continue log function. This function will be called
|
|
* when \a weston_log_continue is called, and should append
|
|
* its output to the current line, without any header or
|
|
* other content in between.
|
|
*/
|
|
WL_EXPORT void
|
|
weston_log_set_handler(log_func_t log, log_func_t cont)
|
|
{
|
|
log_handler = log;
|
|
log_continue_handler = cont;
|
|
}
|
|
|
|
WL_EXPORT int
|
|
weston_vlog(const char *fmt, va_list ap)
|
|
{
|
|
return log_handler(fmt, ap);
|
|
}
|
|
|
|
WL_EXPORT int
|
|
weston_log(const char *fmt, ...)
|
|
{
|
|
int l;
|
|
va_list argp;
|
|
|
|
va_start(argp, fmt);
|
|
l = weston_vlog(fmt, argp);
|
|
va_end(argp);
|
|
|
|
return l;
|
|
}
|
|
|
|
WL_EXPORT int
|
|
weston_vlog_continue(const char *fmt, va_list argp)
|
|
{
|
|
return log_continue_handler(fmt, argp);
|
|
}
|
|
|
|
WL_EXPORT int
|
|
weston_log_continue(const char *fmt, ...)
|
|
{
|
|
int l;
|
|
va_list argp;
|
|
|
|
va_start(argp, fmt);
|
|
l = weston_vlog_continue(fmt, argp);
|
|
va_end(argp);
|
|
|
|
return l;
|
|
}
|