From 87d2c1a64734160a81b588718be858527c3a7f31 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 19 Jun 2015 14:44:07 +0200 Subject: [PATCH] linphonecore: fix linphone_core_set_log_level behavior (eg. take argument not as bit mask but minimum verbosity --- coreapi/linphonecore.c | 19 ++++++++++++++++++- coreapi/linphonecore.h | 7 ++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 618609179..fba29f202 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -171,7 +171,24 @@ void linphone_core_set_log_file(FILE *file) { } void linphone_core_set_log_level(OrtpLogLevel loglevel) { - linphone_core_set_log_level_mask(loglevel); + OrtpLogLevel mask = loglevel; + switch (loglevel) { + case ORTP_TRACE: + case ORTP_DEBUG: + mask |= ORTP_DEBUG; + case ORTP_MESSAGE: + mask |= ORTP_MESSAGE; + case ORTP_WARNING: + mask |= ORTP_WARNING; + case ORTP_ERROR: + mask |= ORTP_ERROR; + case ORTP_FATAL: + mask |= ORTP_FATAL; + break; + case ORTP_LOGLEV_END: + break; + } + linphone_core_set_log_level_mask(mask); } void linphone_core_set_log_level_mask(OrtpLogLevel loglevel) { diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index fa4b5fefc..60190abca 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -2390,12 +2390,13 @@ LINPHONE_PUBLIC void linphone_core_set_log_handler(OrtpLogFunc logfunc); LINPHONE_PUBLIC void linphone_core_set_log_file(FILE *file); /** - * @deprecated Use #linphone_core_set_log_level_mask instead, which is exactly the - * same function.. + * @deprecated Define the log level. + * + * @param loglevel Minimum level for logging messages. **/ LINPHONE_PUBLIC void linphone_core_set_log_level(OrtpLogLevel loglevel); /** - * Define the log level. + * Define the log level using mask. * * @ingroup misc *