Miscellaneous fixes

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

diff --git a/src/libdlog/log.c b/src/libdlog/log.c
index c6ca0d1..e95c863 100644 (file)
--- a/src/libdlog/log.c
+++ b/src/libdlog/log.c
@@ -360,7 +360,7 @@ static int __write_to_log_critical_section(log_id_t log_id, int prio, const char
                return DLOG_ERROR_NONE;
 
        char buf[LOG_MAX_PAYLOAD_SIZE];
-       size_t len = vsnprintf(buf, sizeof buf, fmt, ap);
+       int len = vsnprintf(buf, sizeof buf, fmt, ap);
        if (len < 0)
                return DLOG_ERROR_NONE;
        else if (len >= sizeof buf)

diff --git a/src/logger/fd_entity.c b/src/logger/fd_entity.c
index 64468af..408982a 100644 (file)
--- a/src/logger/fd_entity.c
+++ b/src/logger/fd_entity.c
@@ -68,9 +68,9 @@ int remove_fd_entity(struct epoll_metadata *metadata, struct fd_entity *fd_entit
        if (r < 0)
                return -errno;
 
+       assert(metadata->cnt > 0);
        --metadata->cnt;
 
-       assert(metadata->cnt >= 0);
        return 0;
 }
 

diff --git a/src/logger/logger.c b/src/logger/logger.c
index fe4bc61..92ec8c5 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -367,6 +367,7 @@ int create_fifo_fds(struct logger *server, int fifo_id, int *write_fd, int *read
                check_if_fd_limit_reached(server, errno);
                ret = -errno;
                close(*read_fd);
+               *read_fd = -1;
                goto finish;
        }
 

diff --git a/src/tests/logger.c b/src/tests/logger.c
index 71203d3..a67b5eb 100644 (file)
--- a/src/tests/logger.c
+++ b/src/tests/logger.c
@@ -692,6 +692,7 @@ int main()
        assert(!closed[2]);
 
        logger.epoll_common.cnt = 1;
+       logger.epoll_socket.cnt = 1;
        epoll_ctl_op_correct = EPOLL_CTL_DEL;
        epoll_ctl_fd_correct = 3;
        writer_close_fd(&logger, writer);

diff --git a/src/tests/logutil_pos.c b/src/tests/logutil_pos.c
index 7f7c533..a38e9fc 100644 (file)
--- a/src/tests/logutil_pos.c
+++ b/src/tests/logutil_pos.c
@@ -18,22 +18,6 @@
 
 int main()
 {
-       dlogutil_entry_s ent = {
-               .sec_sent_mono = 0,
-               .nsec_sent_mono = 900000000,
-               .sec_sent_real = 0,
-               .nsec_sent_real = 0,
-               .sec_recv_mono = 1,
-               .nsec_recv_mono = 0,
-               .sec_recv_real = 0,
-               .nsec_recv_real = 999999999,
-       };
-
-       struct timespec ts = {
-               .tv_sec = 1,
-               .tv_nsec = 100000,
-       };
-
        struct sort_vector sv;
        sort_vector_init(&sv);
        sv.sort_by = DLOGUTIL_SORT_SENT_MONO;

diff --git a/src/tests/sort_vector_pos.c b/src/tests/sort_vector_pos.c
index 6f9c30a..4b8d4f3 100644 (file)
--- a/src/tests/sort_vector_pos.c
+++ b/src/tests/sort_vector_pos.c
@@ -226,11 +226,6 @@ void time_span_test(int32_t fir, time_t sec, long time_span)
 
 void call_time_span_test()
 {
-       /* the maximal size of time_t depends on architecture of system
-        * and there is no TIME_T_MIN/MAX, so we need to calculate it */
-       time_t max = get_time_t_max();
-       time_t min = get_time_t_min();
-
        time_span_test(5, 7, 2000);
        time_span_test(7, 5, (unsigned long) -2000);
        time_span_test(3, 3, 0);
@@ -245,7 +240,13 @@ void call_time_span_test()
        time_span_test(6, 2, (unsigned long) -4000);
        time_span_test(1, 20, 19000);
 
-/*     TODO: ?
+#if 0 // some confusing results which rely on signed/unsigned shenanigans, not really worth enshrining in specification
+
+       /* the maximal size of time_t depends on architecture of system
+        * and there is no TIME_T_MIN/MAX, so we need to calculate it */
+       time_t max = get_time_t_max();
+       time_t min = get_time_t_min();
+
        time_span_test(0, max/2 - 1, (unsigned long) -2000);
        time_span_test(0, max/2 + 1, 0);
        time_span_test(max, 2, 3000);
@@ -260,7 +261,7 @@ void call_time_span_test()
        time_span_test(max, max - 1, (unsigned long) -1000);
        time_span_test(min + 1 , max - 2, (unsigned long) -4000);
        time_span_test(min, max, (unsigned long) -1000);
-*/
+#endif
 }
 
 int main()