Remove unnecessary log_entry struct

After removal of unnecessary entry parsing between
two formats it is pointless to keep the log_entry
struct.

Change-Id: I5eb84554a5be299d6aeb2f47d7ae02f7f54bd8c1
Signed-off-by: Maciej Slodczyk <m.slodczyk2@partner.samsung.com>

diff --git a/include/logprint.h b/include/logprint.h
index c0be716..0d42eac 100644 (file)
--- a/include/logprint.h
+++ b/include/logprint.h
@@ -47,19 +47,6 @@ typedef enum {
 
 typedef struct log_format_t log_format;
 
-typedef struct log_entry_t {
-       time_t tv_sec;
-       long tv_nsec;
-       time_t tv_sec_recv;
-       long tv_nsec_recv;
-       log_priority priority;
-       pid_t pid;
-       pthread_t tid;
-       const char *tag;
-       size_t messageLen;
-       const char *message;
-} log_entry;
-
 log_format *log_format_new();
 
 void log_format_free(log_format *p_format);

diff --git a/src/tests/kmsg_parser.c b/src/tests/kmsg_parser.c
index 49dd2ab..0a9b5c8 100644 (file)
--- a/src/tests/kmsg_parser.c
+++ b/src/tests/kmsg_parser.c
@@ -16,26 +16,37 @@ void assert_result(char const *msg, int expected_outcome)
        assert_result_buffer(msg, expected_outcome, &lem);
 }
 
-void assert_entry(char const * msg, log_entry expected)
+void assert_entry(char const * msg, const struct logger_entry_with_msg *expected)
 {
        struct logger_entry_with_msg lem;
        assert_result_buffer(msg, 0, &lem);
 
-       assert(expected.pid == lem.header.pid);
-       assert(expected.tid == lem.header.tid);
-       assert(!strcmp(expected.tag, log_buffer_get_tag(&lem.header)));
-       assert(!strcmp(expected.message, log_buffer_get_message(&lem.header)));
+       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)));
 }
 
 int main()
 {
+       struct logger_entry_with_msg lem;
        assert_result(""             , -EINVAL);
        assert_result("invalid"      , -EINVAL);
        assert_result("1,2,3,4,5,6,7", -EINVAL);
        assert_result(";bla"         , -EINVAL);
 
-       assert_entry("1,234,56789,-;Some message.\n _SOME_IRRELEVANT_TAG=BLA\n",
-               (log_entry) { .pid = 0, .tid = 0, .tag = "DEVKMSG", .message = "Some message." });
+       lem.header.pid = 0;
+       lem.header.tid = 0;
+
+       lem.header.priority = 0;
+       lem.header.tag_len = snprintf(lem.msg, sizeof lem.msg - 1, "%s", "DEVKMSG");
+       lem.header.len = lem.header.tag_len + 1; // plus NULL delimiter
+       lem.header.len += 1 + snprintf(lem.msg + lem.header.len, sizeof lem.msg - 1 - lem.header.len, "%s", "Some message.");
+
+       lem.header.len += sizeof(struct logger_entry);
+       lem.header.padding = 0;
+
+       assert_entry("1,234,56789,-;Some message.\n _SOME_IRRELEVANT_TAG=BLA\n", &lem);
 
        return 0;
 }