vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Mar 20 19:20:56 2013 +0200| [3794d92b4782598295b73442bd41d12df73801ea] | committer: Rémi Denis-Courmont
libvlc: pass log message directly Let the callback format message context infos however it wants. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3794d92b4782598295b73442bd41d12df73801ea --- lib/log.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/lib/log.c b/lib/log.c index fb096e6..c612e87 100644 --- a/lib/log.c +++ b/lib/log.c @@ -61,24 +61,10 @@ void libvlc_log_get_object(const libvlc_log_t *ctx, *id = ctx->i_object_id; } -VLC_FORMAT(4,5) -static void libvlc_log (libvlc_instance_t *inst, int level, - const libvlc_log_t *ctx, const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - inst->log.cb (inst->log.data, level, ctx, fmt, ap); - va_end (ap); -} - static void libvlc_logf (void *data, int level, const vlc_log_t *item, const char *fmt, va_list ap) { - char *msg; - - if (unlikely(vasprintf (&msg, fmt, ap) == -1)) - return; + libvlc_instance_t *inst = data; switch (level) { @@ -88,15 +74,7 @@ static void libvlc_logf (void *data, int level, const vlc_log_t *item, case VLC_MSG_DBG: level = LIBVLC_DEBUG; break; } - if (item->psz_header != NULL) - libvlc_log (data, level, item, "[%p] [%s]: %s %s %s", - (void *)item->i_object_id, item->psz_header, - item->psz_module, item->psz_object_type, msg); - else - libvlc_log (data, level, item, "[%p]: %s %s %s", - (void *)item->i_object_id, item->psz_module, - item->psz_object_type, msg); - free (msg); + inst->log.cb (inst->log.data, level, item, fmt, ap); } void libvlc_log_unset (libvlc_instance_t *inst) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
