From a94ddce0bd9903146f98dac4803807f02a22b460 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Thu, 3 Mar 2022 16:26:59 +0000
Subject: [PATCH] logging : Remove processing for unused variables

---
 common/log.c | 14 ++++++++++++--
 common/log.h |  6 ++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/common/log.c b/common/log.c
index bfce267a..8273e25b 100644
--- a/common/log.c
+++ b/common/log.c
@@ -470,6 +470,7 @@ internalInitAndAllocStruct(void)
     {
         ret->fd = -1;
         ret->enable_syslog = 0;
+#ifdef LOG_PER_LOGGER_LEVEL
         ret->per_logger_level = list_create();
         if (ret->per_logger_level != NULL)
         {
@@ -481,6 +482,7 @@ internalInitAndAllocStruct(void)
             g_free(ret);
             ret = NULL;
         }
+#endif
     }
     else
     {
@@ -493,8 +495,6 @@ internalInitAndAllocStruct(void)
 void
 internal_log_config_copy(struct log_config *dest, const struct log_config *src)
 {
-    int i;
-
     if (src == NULL || dest == NULL)
     {
         return;
@@ -504,8 +504,10 @@ internal_log_config_copy(struct log_config *dest, const struct log_config *src)
     dest->fd = src->fd;
     dest->log_file = g_strdup(src->log_file);
     dest->log_level = src->log_level;
+#ifdef ENABLE_THREAD
     dest->log_lock = src->log_lock;
     dest->log_lock_attr = src->log_lock_attr;
+#endif
     dest->program_name = src->program_name;
     dest->enable_syslog = src->enable_syslog;
     dest->syslog_level = src->syslog_level;
@@ -514,6 +516,7 @@ internal_log_config_copy(struct log_config *dest, const struct log_config *src)
     dest->enable_pid = src->enable_pid;
     dest->dump_on_start = src->dump_on_start;
 
+#ifdef LOG_PER_LOGGER_LEVEL
     if (src->per_logger_level == NULL)
     {
         return;
@@ -528,6 +531,8 @@ internal_log_config_copy(struct log_config *dest, const struct log_config *src)
         dest->per_logger_level->auto_free = 1;
     }
 
+    int i;
+
     for (i = 0; i < src->per_logger_level->count; ++i)
     {
         struct log_logger_level *dst_logger =
@@ -539,6 +544,7 @@ internal_log_config_copy(struct log_config *dest, const struct log_config *src)
 
         list_add_item(dest->per_logger_level, (tbus) dst_logger);
     }
+#endif
 }
 
 bool_t
@@ -591,6 +597,7 @@ internal_log_location_overrides_level(const char *function_name,
                                       const char *file_name,
                                       enum logLevels *log_level_return)
 {
+#ifdef LOG_PER_LOGGER_LEVEL
     struct log_logger_level *logger = NULL;
     int i;
 
@@ -611,6 +618,7 @@ internal_log_location_overrides_level(const char *function_name,
             return 1;
         }
     }
+#endif
 
     return 0;
 }
@@ -682,11 +690,13 @@ log_config_free(struct log_config *config)
 {
     if (config != NULL)
     {
+#ifdef LOG_PER_LOGGER_LEVEL
         if (config->per_logger_level != NULL)
         {
             list_delete(config->per_logger_level);
             config->per_logger_level = NULL;
         }
+#endif
 
         if (0 != config->log_file)
         {
diff --git a/common/log.h b/common/log.h
index 0194a530..e77f502c 100644
--- a/common/log.h
+++ b/common/log.h
@@ -162,6 +162,7 @@ enum logReturns
 
 #endif
 
+#ifdef LOG_PER_LOGGER_LEVEL
 enum log_logger_type
 {
     LOG_TYPE_FILE = 0,
@@ -174,6 +175,7 @@ struct log_logger_level
     enum log_logger_type logger_type;
     char logger_name[LOGGER_NAME_SIZE + 1];
 };
+#endif
 
 struct log_config
 {
@@ -185,11 +187,15 @@ struct log_config
     enum logLevels console_level;
     int enable_syslog;
     enum logLevels syslog_level;
+#ifdef LOG_PER_LOGGER_LEVEL
     struct list *per_logger_level;
+#endif
     int dump_on_start;
     int enable_pid;
+#ifdef LOG_ENABLE_THREAD
     pthread_mutex_t log_lock;
     pthread_mutexattr_t log_lock_attr;
+#endif
 };
 
 /* internal functions, only used in log.c if this ifdef is defined.*/