Fix log_config initialisation properly

The test wrapper around log_config_read had different behaviour
than the real function and did not properly initialise members.

The previous fix was less elegant and is no longer needed.
This partially reverts commit 682e540702101156881a5c3219f1b27a8fcb4894.

Change-Id: Ib9210dabe0c6033fe22de073ceaada30e012cdc5
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/src/libdlog/log.c b/src/libdlog/log.c
index 8c293ac..fd4c6b8 100644 (file)
--- a/src/libdlog/log.c
+++ b/src/libdlog/log.c
@@ -155,7 +155,7 @@ void __update_plog(const struct log_config *conf)
  */
 static void __configure(void)
 {
-       struct log_config config = {.begin = NULL, .last = NULL};
+       struct log_config config;
 
        if (log_config_read(&config) < 0)
                goto out;

diff --git a/src/logger/logger.c b/src/logger/logger.c
index 3a7fd3a..ddf8507 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -2112,10 +2112,10 @@ int prepare_config_data(struct logger_config_data *data, int argc, char **argv)
                return ret;
        }
 
-       struct log_config conf = {.begin = NULL, .last = NULL};
+       struct log_config conf;
        ret = log_config_read(&conf);
        if (ret < 0)
-               goto end;
+               return ret;
 
        const enum sorting_order sort_by = get_order_from_config(&conf);
 

diff --git a/src/tests/config.c b/src/tests/config.c
index ab1b932..0f36ff0 100644 (file)
--- a/src/tests/config.c
+++ b/src/tests/config.c
@@ -53,7 +53,7 @@ int __wrap_open(const char *pathname, int flags, mode_t mode)
 int main()
 {
        const char * get;
-       struct log_config config = {.begin = NULL, .last = NULL};
+       struct log_config config;
 
        setenv("DLOG_CONFIG_PATH", "./non_existent_file", 1);
        assert(log_config_read(&config) == -ENOENT);

diff --git a/src/tests/libdlog_base.c b/src/tests/libdlog_base.c
index 8c6dee6..f96f586 100644 (file)
--- a/src/tests/libdlog_base.c
+++ b/src/tests/libdlog_base.c
@@ -26,10 +26,11 @@ static bool conf_read_called;
 int __wrap_log_config_read(struct log_config *config)
 {
        conf_read_called = true;
+       config->begin = config->last = NULL;
+
        if (fail_conf_read)
                return -1;
 
-       config->begin = config->last = NULL;
        log_config_copy(config, &CONFIG);
        return 0;
 }