tests: fix miscellaneous SVACE trivialities

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

diff --git a/src/tests/fd_info.c b/src/tests/fd_info.c
index 7ab6cd9..4c3226e 100644 (file)
--- a/src/tests/fd_info.c
+++ b/src/tests/fd_info.c
@@ -41,7 +41,7 @@ int __wrap_sort_vector_push(struct sort_vector *logs, struct logger_entry *p, st
        assert(l_file == (struct log_file *) 0xDEFACED);
 
        sv_pushed = true;
-       return 123;
+       return 0;
 }
 
 static bool sv_flushed;
@@ -51,7 +51,7 @@ int __wrap_logfile_write_with_rotation(const struct logger_entry *e, struct log_
        assert(file == (struct log_file *) 0xDEFACED);
 
        sv_flushed = true;
-       return 321;
+       return 0;
 }
 
 struct fd_info G_fdi;
@@ -99,14 +99,14 @@ int main()
        struct fd_info **fdi_arr = NULL;
        fdi_array_free(&fdi_arr);
 
-       fdi_arr = calloc(3, sizeof **fdi_arr);
+       fdi_arr = calloc(3, sizeof *fdi_arr);
        assert(fdi_arr);
        fdi_arr[0] = &G_fdi;
        expect_free1 = fdi_arr;
        expect_free2 = &G_fdi;
        fdi_array_free(&fdi_arr);
 
-       fdi_arr = calloc(3, sizeof **fdi_arr);
+       fdi_arr = calloc(3, sizeof *fdi_arr);
        assert(fdi_arr);
        fdi_arr[1] = &G_fdi;
        expect_free1 = fdi_arr;

diff --git a/src/tests/kmsg_parser.c b/src/tests/kmsg_parser.c
index 2f5a380..6a68861 100644 (file)
--- a/src/tests/kmsg_parser.c
+++ b/src/tests/kmsg_parser.c
@@ -23,8 +23,17 @@ void assert_entry(char const * msg, const struct logger_entry_with_msg *expected
 
        assert(expected->header.pid == lem.header.pid);
        assert(expected->header.tid == lem.header.tid);
-       assert(!strcmp(log_buffer_get_tag(&expected->header), log_buffer_get_tag(&lem.header)));
-       assert(!strcmp(log_buffer_get_message(&expected->header), log_buffer_get_message(&lem.header)));
+
+       const char *const tag_expected = log_buffer_get_tag(&expected->header);
+       const char *const tag_actual   = log_buffer_get_tag(&lem.header);
+       const char *const msg_expected = log_buffer_get_message(&expected->header);
+       const char *const msg_actual   = log_buffer_get_message(&lem.header);
+       assert(tag_expected);
+       assert(tag_actual);
+       assert(msg_expected);
+       assert(msg_actual);
+       assert(!strcmp(tag_expected, tag_actual));
+       assert(!strcmp(msg_expected, msg_actual));
 }
 
 int main()

diff --git a/src/tests/libdlog_pipe.c b/src/tests/libdlog_pipe.c
index 4939f47..1981364 100644 (file)
--- a/src/tests/libdlog_pipe.c
+++ b/src/tests/libdlog_pipe.c
@@ -91,7 +91,7 @@ int main()
        assert(LOG_ID_MAIN == 0);
        for (int i = 1; i < LOG_ID_MAX; ++i) {
                char key[MAX_CONF_KEY_LEN];
-               snprintf(key, sizeof key, "%s_write_sock", log_name_by_id((log_id_t)i));
+               assert(snprintf(key, sizeof key, "%s_write_sock", log_name_by_id((log_id_t)i)) > 0);
                log_config_set(&conf, key, "/foo");
        }
 
@@ -149,7 +149,7 @@ int main()
        called_recv_pipe = 0; \
 } while (0)
 
-       const size_t ITERATIONS_TO_REACH_MIN_TIMEOUT = 2 + log2(DEFAULT_WAIT_PIPE_MS / MIN_WAIT_PIPE_MS);
+       const size_t ITERATIONS_TO_REACH_MIN_TIMEOUT = 2 + (int) log2((float) DEFAULT_WAIT_PIPE_MS / MIN_WAIT_PIPE_MS);
        for (size_t i = 0; i < ITERATIONS_TO_REACH_MIN_TIMEOUT; ++i)
                TC(0, 0, 1, 13, -1, "xx", 1, 1, 1);
        assert(expected_timeout == MIN_WAIT_PIPE_MS);

diff --git a/src/tests/limiter.c b/src/tests/limiter.c
index 883fb7a..23ad5bc 100644 (file)
--- a/src/tests/limiter.c
+++ b/src/tests/limiter.c
@@ -65,7 +65,8 @@ int main()
        assert(!__log_limiter_create(&conf));
 
        struct rule *r = NULL;
-       assert(!__log_limiter_dump_rule(&r, NULL, 0));
+       char buffer[10];
+       assert(!__log_limiter_dump_rule(&r, buffer, sizeof buffer));
        assert(r == NULL);
 
        log_config_set(&conf, "limiter|*|*"  , "allow");

diff --git a/src/tests/log_file.c b/src/tests/log_file.c
index 70f7d62..40cfe32 100644 (file)
--- a/src/tests/log_file.c
+++ b/src/tests/log_file.c
@@ -57,6 +57,7 @@ void *__wrap_memcpy(void *dest, const void *src, size_t n)
 
        assert(src == (void *) 0xBA5EBALL);
        assert(n == sizeof(struct logger_entry));
+       return dest;
 }
 
 static bool fail_snprintf;

diff --git a/src/tests/logctl.c b/src/tests/logctl.c
index a57a82c..abcbe6c 100644 (file)
--- a/src/tests/logctl.c
+++ b/src/tests/logctl.c
@@ -69,8 +69,8 @@ void _prepare_file(const char *const *lines, size_t lines_cnt)
        assert(file_prep);
 
        for (size_t i = 0; i < lines_cnt; ++i) {
-               fputs(lines[i], file_prep);
-               fputc('\n', file_prep);
+               assert(fputs(lines[i], file_prep) >= 0);
+               assert(fputc('\n', file_prep) == '\n');
        }
 }
 #define PREPARE_FILE(lines) _prepare_file(lines, NELEMS(lines))
@@ -150,6 +150,9 @@ void test_copy_file_with_exceptions()
        assert(EXIT_SUCCESS == copy_file_with_exceptions(TMPFILE_PATH, &kv));
 
 #undef TEST_FAIL
+
+       free(kv.keys);
+       free(kv.values);
 }
 
 void test_handle_clear()

diff --git a/src/tests/logprint.c b/src/tests/logprint.c
index 8b1479c..0e13955 100644 (file)
--- a/src/tests/logprint.c
+++ b/src/tests/logprint.c
@@ -144,7 +144,7 @@ void check_logprint_testcases(const char *msg, size_t msg_len, const struct logp
        for (size_t i = 0; i < tests_n; ++i) {
                log_set_print_format(format, tests[i].format);
                entry.header.default_send_ts_type = tests[i].send_ts_type;
-               log_print_log_line(format, 0, &entry.header);
+               assert(log_print_log_line(format, 0, &entry.header) > 0);
                assert(!strcmp(tests[i].result, buffer));
        }
 

diff --git a/src/tests/queued_entry.c b/src/tests/queued_entry.c
index ee518c3..6cd0449 100644 (file)
--- a/src/tests/queued_entry.c
+++ b/src/tests/queued_entry.c
@@ -1,5 +1,6 @@
 // C
 #include <assert.h>
+#include <stddef.h>
 
 // POSIX
 #include <time.h>
@@ -95,11 +96,11 @@ int main()
        ale->nsec_sent = 8;
        ale->pid = 13;
        ale->tid = 21;
-       sprintf(ale->msg, "%c%s%c%s%c"
+       assert(snprintf(ale->msg, sizeof buffer - offsetof(typeof(*ale), msg), "%c%s%c%s%c"
                , (char)DLOG_ERROR
                , "TAG", '\0'
                , "MSG", '\0'
-       );
+       ) > 0);
 
        struct logger_entry_with_msg lewm;
        parse_androidlogger_message(ale, &lewm.header, 9 + sizeof *ale);

diff --git a/tests/test_filters.c b/tests/test_filters.c
index 07bb2d1..f3b2363 100644 (file)
--- a/tests/test_filters.c
+++ b/tests/test_filters.c
@@ -27,8 +27,8 @@
 static inline void close_fd(const int *fd)
 {
        assert(fd);
-       if (*fd != -1)
-               close(*fd);
+       if (*fd >= 0)
+               assert(!close(*fd));
 }
 
 // limit values same as in loglimiter
@@ -57,7 +57,7 @@ int set_config(const char *filename, int flag, char prio, const char *tag, int l
        if (r < 0) {
                int ret = -errno;
                perror("snprintf error");
-               close(fd);
+               assert(!close(fd));
                return ret;
        }