vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Nov 18 15:54:47 2018 +0200| [4b37febabdf2ab2902719fc167fbd3c62a93cb13] | committer: Rémi Denis-Courmont
log: reorder, no semantic changes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b37febabdf2ab2902719fc167fbd3c62a93cb13 --- src/misc/messages.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/misc/messages.c b/src/misc/messages.c index be2b7b836a..6037554af1 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -252,6 +252,26 @@ static void vlc_vaLogEarly(void *d, int type, const vlc_log_t *item, vlc_mutex_unlock(&sys->lock); } +static void vlc_LogEarlyClose(void *d) +{ + vlc_logger_early_t *sys = d; + vlc_logger_t *logger = sys->sink; + libvlc_int_t *vlc = logger->obj.libvlc; + + /* Drain early log messages */ + for (vlc_log_early_t *log = sys->head, *next; log != NULL; log = next) + { + vlc_LogCallback(vlc, log->type, &log->meta, "%s", + (log->msg != NULL) ? log->msg : "message lost"); + free(log->msg); + next = log->next; + free(log); + } + + vlc_mutex_destroy(&sys->lock); + free(sys); +} + static const struct vlc_logger_operations early_ops = { vlc_vaLogEarly, NULL, @@ -274,26 +294,6 @@ static int vlc_LogEarlyOpen(vlc_logger_t *logger) return 0; } -static void vlc_LogEarlyClose(void *d) -{ - vlc_logger_early_t *sys = d; - vlc_logger_t *logger = sys->sink; - libvlc_int_t *vlc = logger->obj.libvlc; - - /* Drain early log messages */ - for (vlc_log_early_t *log = sys->head, *next; log != NULL; log = next) - { - vlc_LogCallback(vlc, log->type, &log->meta, "%s", - (log->msg != NULL) ? log->msg : "message lost"); - free(log->msg); - next = log->next; - free(log); - } - - vlc_mutex_destroy(&sys->lock); - free(sys); -} - static void vlc_vaLogDiscard(void *d, int type, const vlc_log_t *item, const char *format, va_list ap) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
