From b98f97ef624bd1f2d4d50ab8db60783148ebeaf8 Mon Sep 17 00:00:00 2001 From: Dave Pate Date: Mon, 5 Mar 2018 11:28:52 -0800 Subject: [PATCH] Fixes linux/osx build warnings Clarify logic for configuration file --- lib/internal.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/internal.c b/lib/internal.c index 787359e..6f2b81a 100644 --- a/lib/internal.c +++ b/lib/internal.c @@ -523,17 +523,17 @@ setting_bool_t _get_bool_config(const char *sz_setting) { if (*sz_line == '\r') continue; if (*sz_line == '\n') continue; - if (sscanf(sz_line, "%255[^=]=%255s", sz_name, sz_value) == 2); + if (sscanf(sz_line, "%255[^=]=%255s", sz_name, sz_value) == 2) { + /* strip leading/trailing whitespace */ + psz_name = _strip_ws(sz_name); - /* strip leading/trailing whitespace */ - psz_name = _strip_ws(sz_name); + if (!strcasecmp(psz_name, sz_setting)) { + psz_value = _strip_ws(sz_value); - if (!strcasecmp(psz_name, sz_setting)) { - psz_value = _strip_ws(sz_value); - - setting.source = SETTING_SOURCE_ADMIN; - setting.value = (!strcmp(psz_value, "1") || !strcasecmp(psz_value, "true")); - break; + setting.source = SETTING_SOURCE_ADMIN; + setting.value = (!strcmp(psz_value, "1") || !strcasecmp(psz_value, "true")); + break; + } } } } @@ -680,7 +680,7 @@ void yc_log_event(uint32_t id, yc_log_level_t level, const char * sz_format, ... } openlog(szLOG_SOURCE, LOG_PID | LOG_NDELAY, LOG_USER); - syslog(priority, rgsz_message); + syslog(priority, "%s", rgsz_message); closelog(); #endif