mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-log: Return bytes written for 'printf()' and 'vprintf()' functions

Browse Source 
Information is needed for 'vlog()' and 'vlog_continue()' (others
depend on them).

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2019-08-06 17:37:51 +03:00
parent 670ac1c0ed
commit 843b238551
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libweston/weston-log.h
View File

@ -79,11 +79,11 @@ void
weston_log_scope_write(struct weston_log_scope *scope,
const char *data, size_t len);
void
int
weston_log_scope_vprintf(struct weston_log_scope *scope,
const char *fmt, va_list ap);
void
int
weston_log_scope_printf(struct weston_log_scope *scope,
const char *fmt, ...)
__attribute__ ((format (printf, 2, 3)));

15
libweston/weston-log.c
View File

@ -753,16 +753,16 @@ weston_log_scope_write(struct weston_log_scope *scope,
*
* \memberof weston_log_scope
*/
WL_EXPORT void
WL_EXPORT int
weston_log_scope_vprintf(struct weston_log_scope *scope,
const char *fmt, va_list ap)
{
static const char oom[] = "Out of memory";
char *str;
int len;
int len = 0;
if (!weston_log_scope_is_enabled(scope))
return;
return len;
len = vasprintf(&str, fmt, ap);
if (len >= 0) {
@ -771,6 +771,8 @@ weston_log_scope_vprintf(struct weston_log_scope *scope,
} else {
weston_log_scope_write(scope, oom, sizeof oom - 1);
}
return len;
}
/** Write a formatted string for a scope
@ -786,15 +788,18 @@ weston_log_scope_vprintf(struct weston_log_scope *scope,
*
* \memberof weston_log_scope
*/
WL_EXPORT void
WL_EXPORT int
weston_log_scope_printf(struct weston_log_scope *scope,
const char *fmt, ...)
{
va_list ap;
int len;
va_start(ap, fmt);
weston_log_scope_vprintf(scope, fmt, ap);
len = weston_log_scope_vprintf(scope, fmt, ap);
va_end(ap);
return len;
}
/** Write a formatted string for a subscription