Code beautification using uncrustify

Signed-off-by: Christoph Lipka <clipka@de.adit-jv.com>
author: Christoph Lipka <clipka@de.adit-jv.com> 2018-12-20 14:58:19 +0100
committer: Christoph Lipka <clipka@de.adit-jv.com> 2018-12-21 10:23:41 +0100
commit: dca8ab254aa0a687c32009079d85e4d8f960b213 (patch)
tree: e63b6a552fd9f61873892110a56a89ef354864cd /tests
parent: 0d0c74640c8b792db37cb9f884f89f7561ea551f (diff)
download: DLT-daemon-dca8ab254aa0a687c32009079d85e4d8f960b213.tar.gz
11 files changed, 4929 insertions, 4388 deletions
diff --git a/tests/dlt-test-cpp-extension.cpp b/tests/dlt-test-cpp-extension.cpp
index c4cf70c..342f977 100644
--- a/tests/dlt-test-cpp-extension.cpp
+++ b/tests/dlt-test-cpp-extension.cpp
@@ -22,7 +22,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-cpp-extension.cpp
-*/
+ */
 
 #include "dlt_cpp_extension.hpp"
 #include <stdio.h>
@@ -36,7 +36,7 @@ struct MyStruct
 };
 
 template<>
-inline int logToDlt(DltContextData & log, MyStruct const & value)
+inline int logToDlt(DltContextData &log, MyStruct const &value)
 {
     int result = 0;
 
@@ -49,9 +49,7 @@ inline int logToDlt(DltContextData & log, MyStruct const & value)
     result += dlt_user_log_write_string(&log, ")");
 
     if (result != 0)
-    {
         result = -1;
-    }
 
     return result;
 }
@@ -62,15 +60,14 @@ inline int logToDlt(DltContextData & log, MyStruct const & value)
  */
 int main()
 {
-    if (dlt_register_app("TCPP", "Test cpp extension") < 0)
-    {
+    if (dlt_register_app("TCPP", "Test cpp extension") < 0) {
         printf("Failed to register application\n");
         return -1;
     }
 
     DltContext ctx;
-    if (dlt_register_context_ll_ts(&ctx, "TCPP", "Test cpp extension", DLT_LOG_INFO, DLT_TRACE_STATUS_OFF) < 0)
-    {
+
+    if (dlt_register_context_ll_ts(&ctx, "TCPP", "Test cpp extension", DLT_LOG_INFO, DLT_TRACE_STATUS_OFF) < 0) {
         printf("Failed to register context\n");
         return -1;
     }
@@ -89,7 +86,7 @@ int main()
     MyStruct myData = { 1u, 2u, 3u };
     DLT_LOG_CXX(ctx, DLT_LOG_WARN, "MyStruct myData", myData);
 
-    char * non_const_string = (char *) malloc(17);
+    char *non_const_string = (char *)malloc(17);
     memcpy(non_const_string, "non_const_string", 16);
     non_const_string[16] = 0;
     DLT_LOG_CXX(ctx, DLT_LOG_WARN, "char *", non_const_string);
diff --git a/tests/dlt-test-preregister-context.c b/tests/dlt-test-preregister-context.c
index 2f66347..ea70789 100644
--- a/tests/dlt-test-preregister-context.c
+++ b/tests/dlt-test-preregister-context.c
@@ -22,7 +22,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt-test-preregister-context.c
-*/
+ */
 
 #include <unistd.h> /* for fork() */
 
diff --git a/tests/dlt_env_ll_unit_test.cpp b/tests/dlt_env_ll_unit_test.cpp
index a5387bf..3c8e5f1 100644
--- a/tests/dlt_env_ll_unit_test.cpp
+++ b/tests/dlt_env_ll_unit_test.cpp
@@ -22,7 +22,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_env_ll_unit_test.cpp
-*/
+ */
 
 #include "gtest/gtest.h"
 #include "dlt_user.h"
@@ -31,7 +31,7 @@
 /* simply include the whole file to allow testing it */
 #include "src/lib/dlt_env_ll.c"
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
@@ -45,7 +45,7 @@ TEST(DltExtensionTests, extract_id)
     char env0[] = "abcd:1234:3";
     char *tmp = &env0[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env0[0], 4); // moved 4 bytes
+    ASSERT_EQ(tmp - &env0[0], 4); /* moved 4 bytes */
     ASSERT_EQ(id[0], 'a');
     ASSERT_EQ(id[1], 'b');
     ASSERT_EQ(id[2], 'c');
@@ -54,7 +54,7 @@ TEST(DltExtensionTests, extract_id)
     char env1[] = "abc:1234:3";
     tmp = &env1[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env1[0], 3); // moved 3 bytes
+    ASSERT_EQ(tmp - &env1[0], 3); /* moved 3 bytes */
     ASSERT_EQ(id[0], 'a');
     ASSERT_EQ(id[1], 'b');
     ASSERT_EQ(id[2], 'c');
@@ -63,7 +63,7 @@ TEST(DltExtensionTests, extract_id)
     char env2[] = "ab:1234:3";
     tmp = &env2[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env2[0], 2); // moved 2 bytes
+    ASSERT_EQ(tmp - &env2[0], 2); /* moved 2 bytes */
     ASSERT_EQ(id[0], 'a');
     ASSERT_EQ(id[1], 'b');
     ASSERT_EQ(id[2], 0);
@@ -72,7 +72,7 @@ TEST(DltExtensionTests, extract_id)
     char env3[] = "a:1234:3";
     tmp = &env3[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env3[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env3[0], 1); /* moved 1 byte */
     ASSERT_EQ(id[0], 'a');
     ASSERT_EQ(id[1], 0);
     ASSERT_EQ(id[2], 0);
@@ -81,7 +81,7 @@ TEST(DltExtensionTests, extract_id)
     char env4[] = ":1234:3";
     tmp = &env4[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env4[0], 0); // moved 1 byte
+    ASSERT_EQ(tmp - &env4[0], 0); /* moved 1 byte */
     ASSERT_EQ(id[0], 0);
     ASSERT_EQ(id[1], 0);
     ASSERT_EQ(id[2], 0);
@@ -90,7 +90,7 @@ TEST(DltExtensionTests, extract_id)
     char env5[] = "abcd:1234:3;";
     tmp = &env5[0];
     ASSERT_EQ(dlt_env_extract_id(&tmp, id), 0);
-    ASSERT_EQ(tmp - &env5[0], 4); // moved 4 bytes
+    ASSERT_EQ(tmp - &env5[0], 4); /* moved 4 bytes */
     ASSERT_EQ(id[0], 'a');
     ASSERT_EQ(id[1], 'b');
     ASSERT_EQ(id[2], 'c');
@@ -129,49 +129,49 @@ TEST(DltExtensionTests, extract_ll)
     char env_1[] = "-1";
     char *tmp = &env_1[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env_1[0], 2); // moved 2 bytes
+    ASSERT_EQ(tmp - &env_1[0], 2); /* moved 2 bytes */
     ASSERT_EQ(ll, -1);
 
     char env0[] = "0;";
     tmp = &env0[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env0[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env0[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 0);
 
     char env1[] = "1;";
     tmp = &env1[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env1[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env1[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 1);
 
     char env2[] = "2;";
     tmp = &env2[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env2[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env2[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 2);
 
     char env3[] = "3;";
     tmp = &env3[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env3[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env3[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 3);
 
     char env4[] = "4;";
     tmp = &env4[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env4[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env4[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 4);
 
     char env5[] = "5;";
     tmp = &env5[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env5[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env5[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 5);
 
     char env6[] = "6;";
     tmp = &env6[0];
     ASSERT_EQ(dlt_env_extract_ll(&tmp, &ll), 0);
-    ASSERT_EQ(tmp - &env6[0], 1); // moved 1 byte
+    ASSERT_EQ(tmp - &env6[0], 1); /* moved 1 byte */
     ASSERT_EQ(ll, 6);
 
     /* testing invalid input */
@@ -211,7 +211,7 @@ TEST(DltExtensionTests, extract_ll_item)
     char env0[] = "abcd:1234:3";
     char *tmp = &env0[0];
     ASSERT_EQ(dlt_env_extract_ll_item(&tmp, &item), 0);
-    ASSERT_EQ(tmp - &env0[0], 11); // moved 11 bytes
+    ASSERT_EQ(tmp - &env0[0], 11); /* moved 11 bytes */
     ASSERT_EQ(item.appId[0], 'a');
     ASSERT_EQ(item.appId[1], 'b');
     ASSERT_EQ(item.appId[2], 'c');
@@ -225,7 +225,7 @@ TEST(DltExtensionTests, extract_ll_item)
     char env1[] = "::-1;";
     tmp = &env1[0];
     ASSERT_EQ(dlt_env_extract_ll_item(&tmp, &item), 0);
-    ASSERT_EQ(tmp - &env1[0], 4); // moved 4 bytes
+    ASSERT_EQ(tmp - &env1[0], 4); /* moved 4 bytes */
     ASSERT_EQ(item.appId[0], 0);
     ASSERT_EQ(item.appId[1], 0);
     ASSERT_EQ(item.appId[2], 0);
@@ -271,9 +271,9 @@ TEST(DltExtensionTests, extract_ll_item)
 
 TEST(DltExtensionTests, basic_ll_set_handling)
 {
-    dlt_env_init_ll_set(NULL); // must not crash
-    dlt_env_free_ll_set(NULL); // must not crash
-    dlt_env_increase_ll_set(NULL); // must not crash
+    dlt_env_init_ll_set(NULL); /* must not crash */
+    dlt_env_free_ll_set(NULL); /* must not crash */
+    dlt_env_increase_ll_set(NULL); /* must not crash */
 
     dlt_env_ll_set ll_set;
     dlt_env_init_ll_set(&ll_set);
@@ -287,16 +287,16 @@ TEST(DltExtensionTests, basic_ll_set_handling)
     EXPECT_EQ(0, ll_set.num_elem);
 
     dlt_env_init_ll_set(&ll_set);
+
     for (int i = 0; i < DLT_ENV_LL_SET_INCREASE; ++i)
-    {
         ll_set.item[i].ll = i;
-    }
+
     dlt_env_increase_ll_set(&ll_set);
     EXPECT_EQ(2 * DLT_ENV_LL_SET_INCREASE, ll_set.array_size);
+
     for (int i = 0; i < DLT_ENV_LL_SET_INCREASE; ++i)
-    {
         EXPECT_EQ(ll_set.item[i].ll, i);
-    }
+
     dlt_env_free_ll_set(&ll_set);
     EXPECT_TRUE(NULL == ll_set.item);
     EXPECT_EQ(0, ll_set.array_size);
@@ -320,15 +320,14 @@ TEST(DltExtensionTests, extract_ll_set)
 
     /* force increasing the list */
     char env1[] =
-                    "abcd:0000:3;abcd:0001:3;abcd:0002:3;abcd:0003:3;abcd:0004:3;abcd:0005:3;abcd:0006:3;abcd:0007:3;abcd:0008:3;abcd:0009:3;abcd:0010:3";
+        "abcd:0000:3;abcd:0001:3;abcd:0002:3;abcd:0003:3;abcd:0004:3;abcd:0005:3;abcd:0006:3;abcd:0007:3;abcd:0008:3;abcd:0009:3;abcd:0010:3";
     tmp = &env1[0];
     ASSERT_EQ(dlt_env_extract_ll_set(&tmp, &ll_set), 0);
     EXPECT_EQ(ll_set.array_size, 2 * DLT_ENV_LL_SET_INCREASE);
     EXPECT_EQ(ll_set.num_elem, 11);
+
     for (size_t i = 0; i < ll_set.num_elem; ++i)
-    {
         EXPECT_EQ(ll_set.item[i].ctxId[3], i % 10 + '0');
-    }
 
     dlt_env_free_ll_set(&ll_set);
 
@@ -439,56 +438,56 @@ TEST(DltExtensionTests, adjust_ll_from_env)
     dlt_env_free_ll_set(&ll_set);
 }
 
-// int dlt_env_helper_to_lower(char **env, char *result, int res_len)
+/* int dlt_env_helper_to_lower(char **env, char *result, int res_len) */
 TEST(DltExtensionTests, dlt_env_helper_to_lower)
 {
-    // default behavior
+    /* default behavior */
     char env0[] = "1238<><<>>>>#$//abcdABCDEDFGHIJKLMNOPQRSTUVWXYZpo;ABcd";
     char res0[] = "1238<><<>>>>#$//abcdabcdedfghijklmnopqrstuvwxyzpo";
     char *tmp0 = &env0[0];
 
     char result0[sizeof(res0)];
     ASSERT_EQ(0, dlt_env_helper_to_lower(&tmp0, result0, sizeof(result0)));
-    ASSERT_EQ(';', *tmp0); // next char is ';'
-    ASSERT_STREQ(res0, result0); // stops at ';' and is correctly converted
+    ASSERT_EQ(';', *tmp0); /* next char is ';' */
+    ASSERT_STREQ(res0, result0); /* stops at ';' and is correctly converted */
 
-    // default behavior with end of string
+    /* default behavior with end of string */
     char env1[] = "1238<><<>>>>#$//abcdABCDEDFGHIJKLMNOPQRSTUVWXYZpo";
     char res1[] = "1238<><<>>>>#$//abcdabcdedfghijklmnopqrstuvwxyzpo";
     char *tmp1 = &env1[0];
 
     char result1[sizeof(res1)];
     ASSERT_EQ(0, dlt_env_helper_to_lower(&tmp1, result1, sizeof(result1)));
-    ASSERT_EQ(0, *tmp1); // next char is void
-    ASSERT_STREQ(res1, result1); // stops at end-of-string and is correctly converted
+    ASSERT_EQ(0, *tmp1); /* next char is void */
+    ASSERT_STREQ(res1, result1); /* stops at end-of-string and is correctly converted */
 
-    // result string too short
+    /* result string too short */
     char env2[] = "2238<><<>>>>#$//abcdABCDEDFGHIJKLMNOPQRSTUVWXYZpo";
     char res2[] = "2238<><<>>>>#$//abcdabcdedfg";
     char *tmp2 = &env2[0];
 
     char result2[sizeof(res2)];
     ASSERT_EQ(-1, dlt_env_helper_to_lower(&tmp2, result2, sizeof(result2)));
-    ASSERT_EQ('H', *tmp2); // next char is void
-    ASSERT_STREQ(res2, result2); // stops at end-of-string and is partially converted
+    ASSERT_EQ('H', *tmp2); /* next char is void */
+    ASSERT_STREQ(res2, result2); /* stops at end-of-string and is partially converted */
 
-    // input string shorter than result
+    /* input string shorter than result */
     char env3[] = "3338<><<>>>>#$//abcdABCDEDFGHIJKLMNOPQRSTUVWXYZpo";
     char res3[] = "3338<><<>>>>#$//abcdabcdedfghijklmnopqrstuvwxyzpo";
     char *tmp3 = &env3[0];
 
     char result3[sizeof(res3) + 5];
     ASSERT_EQ(0, dlt_env_helper_to_lower(&tmp3, result3, sizeof(result3)));
-    ASSERT_EQ(0, *tmp3); // next char is void
-    ASSERT_STREQ(res3, result3); // stops at end-of-string and is correctly converted
+    ASSERT_EQ(0, *tmp3); /* next char is void */
+    ASSERT_STREQ(res3, result3); /* stops at end-of-string and is correctly converted */
 }
 
-// int dlt_env_extract_symbolic_ll(char **env, int8_t * ll)
+/* int dlt_env_extract_symbolic_ll(char **env, int8_t * ll) */
 TEST(DltExtensionTests, dlt_env_extract_symbolic_ll)
 {
     int8_t result;
 
-    // correct behavior
+    /* correct behavior */
     char env0[] = "DEFAULT;off;fatal;error;warning;info;DeBuG;verbose";
     char *tmp0 = &env0[0];
 
@@ -524,7 +523,7 @@ TEST(DltExtensionTests, dlt_env_extract_symbolic_ll)
     ASSERT_EQ(0, *tmp0);
     ASSERT_EQ(6, result);
 
-    // incorrect behavior
+    /* incorrect behavior */
     char env1[] = "DEF";
     char *tmp1 = &env1[0];
 
@@ -533,7 +532,7 @@ TEST(DltExtensionTests, dlt_env_extract_symbolic_ll)
     ASSERT_EQ(0, *tmp1);
     ASSERT_EQ(18, result); /* 'result' is not touched */
 
-    // incorrect behavior
+    /* incorrect behavior */
     char env2[] = "DEFaultingfBa";
     char *tmp2 = &env2[0];
 
diff --git a/tests/dlt_test_receiver.c b/tests/dlt_test_receiver.c
index 555d5da..80ae900 100644
--- a/tests/dlt_test_receiver.c
+++ b/tests/dlt_test_receiver.c
@@ -25,7 +25,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file dlt_test_receiver.c
-*/
+ */
 
 
 /*******************************************************************************
@@ -67,8 +67,8 @@
  * $LastChangedRevision: 1670 $
  * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $
  * $LastChangedBy$
- Initials    Date         Comment
- aw          13.01.2010   initial
+ * Initials    Date         Comment
+ * aw          13.01.2010   initial
  */
 
 #include <ctype.h>      /* for isprint() */
@@ -112,7 +112,7 @@ void usage()
 {
     char version[255];
 
-    dlt_get_version(version,255);
+    dlt_get_version(version, 255);
 
     printf("Usage: dlt-receive [options] hostname/serial_device_name\n");
     printf("Receive DLT messages from DLT daemon and print or store the messages.\n");
@@ -133,9 +133,9 @@ void usage()
 /**
  * Main function of tool.
  */
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
-    DltClient      dltclient;
+    DltClient dltclient;
     DltReceiveData dltdata;
     int c;
     int index;
@@ -146,7 +146,7 @@ int main(int argc, char* argv[])
     dltdata.ovalue = 0;
     dltdata.evalue = 0;
     dltdata.bvalue = 0;
-    dltdata.ohandle=-1;
+    dltdata.ohandle = -1;
     dltdata.filetransfervalue = 0;
     dltdata.systemjournalvalue = 0;
 
@@ -154,76 +154,70 @@ int main(int argc, char* argv[])
     opterr = 0;
 
     while ((c = getopt (argc, argv, "vshyfla:o:e:b:")) != -1)
-        switch (c)
-        {
+        switch (c) {
         case 'v':
-            {
-                dltdata.vflag = 1;
-                break;
-            }
+        {
+            dltdata.vflag = 1;
+            break;
+        }
         case 'h':
-            {
-                usage();
-                return -1;
-            }
+        {
+            usage();
+            return -1;
+        }
         case 'y':
-            {
-                dltdata.yflag = 1;
-                break;
-            }
+        {
+            dltdata.yflag = 1;
+            break;
+        }
         case 'f':
-            {
-                dltdata.filetransfervalue = 1;
-                break;
-            }
+        {
+            dltdata.filetransfervalue = 1;
+            break;
+        }
         case 's':
-            {
-                dltdata.systemjournalvalue = 1;
-                break;
-            }
+        {
+            dltdata.systemjournalvalue = 1;
+            break;
+        }
         case 'l':
-            {
-                dltdata.systemloggervalue = 1;
-                break;
-            }
+        {
+            dltdata.systemloggervalue = 1;
+            break;
+        }
         case 'o':
-            {
-                dltdata.ovalue = optarg;
-                break;
-            }
+        {
+            dltdata.ovalue = optarg;
+            break;
+        }
         case 'e':
-            {
-                dltdata.evalue = optarg;
-                break;
-            }
+        {
+            dltdata.evalue = optarg;
+            break;
+        }
         case 'b':
-            {
-                dltdata.bvalue = atoi(optarg);
-                break;
-            }
+        {
+            dltdata.bvalue = atoi(optarg);
+            break;
+        }
         case '?':
-            {
-                if (optopt == 'o')
-                {
-                    fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-                }
-                else if (isprint (optopt))
-                {
-                    fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-                }
-                else
-                {
-                    fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt);
-                }
-                /* unknown or wrong option used, show usage information and terminate */
-                usage();
-                return -1;
-            }
+        {
+            if (optopt == 'o')
+                fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+            else if (isprint (optopt))
+                fprintf (stderr, "Unknown option `-%c'.\n", optopt);
+            else
+                fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt);
+
+            /* unknown or wrong option used, show usage information and terminate */
+            usage();
+            return -1;
+        }
         default:
-            {
-                abort ();
-                return -1;//for parasoft
-            }
+        {
+            abort ();
+            return -1;    /*for parasoft */
+        }
         }
 
     /* Initialize DLT Client */
@@ -235,96 +229,81 @@ int main(int argc, char* argv[])
     /* Setup DLT Client structure */
     dltclient.mode = dltdata.yflag;
 
-    if (dltclient.mode==0)
-    {
+    if (dltclient.mode == 0) {
         for (index = optind; index < argc; index++)
-        {
-            if(dlt_client_set_server_ip(&dltclient, argv[index]) == -1)
-            {
-                fprintf(stderr,"set server ip didn't succeed\n");
+            if (dlt_client_set_server_ip(&dltclient, argv[index]) == -1) {
+                fprintf(stderr, "set server ip didn't succeed\n");
                 return -1;
             }
-        }
 
-        if (dltclient.servIP == 0)
-        {
+
+
+        if (dltclient.servIP == 0) {
             /* no hostname selected, show usage and terminate */
-            fprintf(stderr,"ERROR: No hostname selected\n");
+            fprintf(stderr, "ERROR: No hostname selected\n");
             usage();
-            dlt_client_cleanup(&dltclient,dltdata.vflag);
+            dlt_client_cleanup(&dltclient, dltdata.vflag);
             return -1;
         }
     }
-    else
-    {
+    else {
         for (index = optind; index < argc; index++)
-        {
-            if(dlt_client_set_serial_device(&dltclient, argv[index]) == -1)
-            {
-                fprintf(stderr,"set serial device didn't succeed\n");
+            if (dlt_client_set_serial_device(&dltclient, argv[index]) == -1) {
+                fprintf(stderr, "set serial device didn't succeed\n");
                 return -1;
             }
-        }
 
-        if (dltclient.serialDevice == 0)
-        {
+
+
+        if (dltclient.serialDevice == 0) {
             /* no serial device name selected, show usage and terminate */
-            fprintf(stderr,"ERROR: No serial device name specified\n");
+            fprintf(stderr, "ERROR: No serial device name specified\n");
             usage();
             return -1;
         }
 
-        dlt_client_setbaudrate(&dltclient,dltdata.bvalue);
+        dlt_client_setbaudrate(&dltclient, dltdata.bvalue);
     }
 
     /* initialise structure to use DLT file */
-    dlt_file_init(&(dltdata.file),dltdata.vflag);
+    dlt_file_init(&(dltdata.file), dltdata.vflag);
 
     /* first parse filter file if filter parameter is used */
-    dlt_filter_init(&(dltdata.filter),dltdata.vflag);
+    dlt_filter_init(&(dltdata.filter), dltdata.vflag);
 
     /* open DLT output file */
-    if (dltdata.ovalue)
-    {
-        dltdata.ohandle = open(dltdata.ovalue,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */
+    if (dltdata.ovalue) {
+        dltdata.ohandle = open(dltdata.ovalue, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* mode: wb */
 
-        if (dltdata.ohandle == -1)
-        {
-            dlt_file_free(&(dltdata.file),dltdata.vflag);
-            fprintf(stderr,"ERROR: Output file %s cannot be opened!\n",dltdata.ovalue);
+        if (dltdata.ohandle == -1) {
+            dlt_file_free(&(dltdata.file), dltdata.vflag);
+            fprintf(stderr, "ERROR: Output file %s cannot be opened!\n", dltdata.ovalue);
             return -1;
         }
     }
 
     if (dltdata.evalue)
-    {
-        dlt_set_id(dltdata.ecuid,dltdata.evalue);
-    }
+        dlt_set_id(dltdata.ecuid, dltdata.evalue);
     else
-    {
-        dlt_set_id(dltdata.ecuid,DLT_RECEIVE_ECU_ID);
-    }
+        dlt_set_id(dltdata.ecuid, DLT_RECEIVE_ECU_ID);
 
     /* Connect to TCP socket or open serial device */
-    if (dlt_client_connect(&dltclient, dltdata.vflag) != DLT_RETURN_ERROR)
-    {
+    if (dlt_client_connect(&dltclient, dltdata.vflag) != DLT_RETURN_ERROR) {
 
         /* Dlt Client Main Loop */
         dlt_client_main_loop(&dltclient, &dltdata, dltdata.vflag);
 
         /* Dlt Client Cleanup */
-        dlt_client_cleanup(&dltclient,dltdata.vflag);
+        dlt_client_cleanup(&dltclient, dltdata.vflag);
     }
 
     /* dlt-receive cleanup */
     if (dltdata.ovalue)
-    {
         close(dltdata.ohandle);
-    }
 
-    dlt_file_free(&(dltdata.file),dltdata.vflag);
+    dlt_file_free(&(dltdata.file), dltdata.vflag);
 
-    dlt_filter_free(&(dltdata.filter),dltdata.vflag);
+    dlt_filter_free(&(dltdata.filter), dltdata.vflag);
 
     return 0;
 }
@@ -337,113 +316,104 @@ int dlt_receive_filetransfer_callback(DltMessage *message, void *data)
     struct iovec iov[2];
     int bytes_written;
 
-    if ((message==0) || (data==0))
-    {
+    if ((message == 0) || (data == 0))
         return -1;
-    }
 
-    dltdata = (DltReceiveData*)data;
+    dltdata = (DltReceiveData *)data;
 
-    if(dltdata->filetransfervalue)
-    {
+    if (dltdata->filetransfervalue) {
         dlt_message_print_ascii(message, text, DLT_RECEIVE_BUFSIZE, dltdata->vflag);
 
-        // 1st find starting point of tranfering data packages
-        if( strncmp(text, "FLST", 4) == 0)
-        {
+        /* 1st find starting point of tranfering data packages */
+        if (strncmp(text, "FLST", 4) == 0) {
             char *tmpFilename;
             tmpFilename = strrchr(text, '/') + 1;
             unsigned int i;
-            for(i=0; i<strlen(tmpFilename);i++)
-            {
-                if(isspace(tmpFilename[i]))
-                {
-                    tmpFilename[i] ='\0';
+
+            for (i = 0; i < strlen(tmpFilename); i++)
+                if (isspace(tmpFilename[i])) {
+                    tmpFilename[i] = '\0';
                     break;
                 }
-            }
-            // create file for each received file, as named as crc value
+
+            /* create file for each received file, as named as crc value */
             snprintf(filename, 255, "/tmp/%s", tmpFilename);
             fp = fopen(filename, "w+");
         }
 
-        // 3rd close fp
-        if( strncmp(text, "FLFI", 4) == 0)
-        {
+        /* 3rd close fp */
+        if (strncmp(text, "FLFI", 4) == 0) {
             printf("TEST FILETRANSFER PASSED\n");
             fclose(fp);
         }
 
-        // 2nd check if incomming data are filetransfer data
-        if( strncmp(text, "FLDA", 4) == 0)
-        {
-            // truncate beginning of data stream ( FLDA, File identifier and package number)
-            char *position = strchr(text, 32); // search for space
-            strncpy(text, position+1, DLT_RECEIVE_BUFSIZE);
+        /* 2nd check if incomming data are filetransfer data */
+        if (strncmp(text, "FLDA", 4) == 0) {
+            /* truncate beginning of data stream ( FLDA, File identifier and package number) */
+            char *position = strchr(text, 32); /* search for space */
+            strncpy(text, position + 1, DLT_RECEIVE_BUFSIZE);
             position = strchr(text, 32);
-            strncpy(text, position+1, DLT_RECEIVE_BUFSIZE);
+            strncpy(text, position + 1, DLT_RECEIVE_BUFSIZE);
             position = strchr(text, 32);
-            strncpy(text, position+1, DLT_RECEIVE_BUFSIZE);
+            strncpy(text, position + 1, DLT_RECEIVE_BUFSIZE);
 
-            // truncate ending of data stream ( FLDA )
+            /* truncate ending of data stream ( FLDA ) */
             int len = strlen(text);
             text[len - 4] = '\0';
-            // hex to ascii and store at /tmp
+            /* hex to ascii and store at /tmp */
             char tmp[3];
             int i;
-            for(i = 0;i< (int) strlen(text); i = i+3)
-            {
+
+            for (i = 0; i < (int)strlen(text); i = i + 3) {
                 tmp[0] = text[i];
-                tmp[1] = text[i+1];
+                tmp[1] = text[i + 1];
                 tmp[2] = '\0';
                 unsigned long h = strtoul(tmp, NULL, 16);
-                fprintf(fp, "%c", (int) h);
+                fprintf(fp, "%c", (int)h);
             }
         }
     }
 
-    if(dltdata->systemjournalvalue)
-    {
+    if (dltdata->systemjournalvalue) {
         dlt_message_print_ascii(message, text, DLT_RECEIVE_BUFSIZE, dltdata->vflag);
-        // 1st find the relevant packages
-        char * tmp = message->extendedheader->ctid;
+        /* 1st find the relevant packages */
+        char *tmp = message->extendedheader->ctid;
         tmp[4] = '\0';
-        if( strcmp( tmp , (const char *) "JOUR") == 0)
-        {
-            if(strstr(text,"DLT SYSTEM JOURNAL TEST"))
-            {
-                result ++;
-                if( result == 1000)
+
+        if (strcmp(tmp, (const char *)"JOUR") == 0) {
+            if (strstr(text, "DLT SYSTEM JOURNAL TEST")) {
+                result++;
+
+                if (result == 1000)
                     exit(159);
             }
         }
     }
 
-    if(dltdata->systemloggervalue)
-    {
+    if (dltdata->systemloggervalue) {
         dlt_message_print_ascii(message, text, DLT_RECEIVE_BUFSIZE, dltdata->vflag);
-        // 1st find the relevant packages
-        char * tmp = message->extendedheader->ctid;
+        /* 1st find the relevant packages */
+        char *tmp = message->extendedheader->ctid;
         tmp[4] = '\0';
-        const char * substring = text;
-        const char * founding = "Test Systemlogger";
+        const char *substring = text;
+        const char *founding = "Test Systemlogger";
         int length = strlen(founding);
-        if( strcmp( tmp , (const char *) "PROC") == 0)
-        {
+
+        if (strcmp(tmp, (const char *)"PROC") == 0) {
             substring = strstr(text, founding);
-            while (substring != NULL)
-            {
-                result ++;
-                substring +=length;
-                if(result == 1000)
+
+            while (substring != NULL) {
+                result++;
+                substring += length;
+
+                if (result == 1000)
                     exit(159);
             }
         }
     }
 
     /* if file output enabled write message */
-    if (dltdata->ovalue)
-    {
+    if (dltdata->ovalue) {
         iov[0].iov_base = message->headerbuffer;
         iov[0].iov_len = message->headersize;
         iov[1].iov_base = message->databuffer;
@@ -451,9 +421,9 @@ int dlt_receive_filetransfer_callback(DltMessage *message, void *data)
 
         bytes_written = writev(dltdata->ohandle, iov, 2);
 
-        if (0 > bytes_written){
-                printf("dlt_receive_message_callback: writev(dltdata->ohandle, iov, 2); returned an error!" );
-                return -1;
+        if (0 > bytes_written) {
+            printf("dlt_receive_message_callback: writev(dltdata->ohandle, iov, 2); returned an error!");
+            return -1;
         }
     }
 
diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp
index 27831d3..b944f4d 100644
--- a/tests/gtest_dlt_common.cpp
+++ b/tests/gtest_dlt_common.cpp
@@ -23,7 +23,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file gtest_dlt_common.cpp
-*/
+ */
 
 #include <stdio.h>
 #include <gtest/gtest.h>
@@ -40,14 +40,20 @@ extern "C"
 int dlt_buffer_increase_size(DltBuffer *);
 int dlt_buffer_minimize_size(DltBuffer *);
 int dlt_buffer_reset(DltBuffer *);
-DltReturnValue dlt_buffer_push(DltBuffer *,const unsigned char *,unsigned int);
-DltReturnValue dlt_buffer_push3(DltBuffer *,const unsigned char *,unsigned int,const unsigned char *,unsigned int,const unsigned char *,unsigned int);
-int dlt_buffer_get(DltBuffer *,unsigned char *, int,int);
-int dlt_buffer_pull(DltBuffer *,unsigned char *, int);
+DltReturnValue dlt_buffer_push(DltBuffer *, const unsigned char *, unsigned int);
+DltReturnValue dlt_buffer_push3(DltBuffer *,
+                                const unsigned char *,
+                                unsigned int,
+                                const unsigned char *,
+                                unsigned int,
+                                const unsigned char *,
+                                unsigned int);
+int dlt_buffer_get(DltBuffer *, unsigned char *, int, int);
+int dlt_buffer_pull(DltBuffer *, unsigned char *, int);
 int dlt_buffer_remove(DltBuffer *);
 void dlt_buffer_status(DltBuffer *);
-void dlt_buffer_write_block(DltBuffer *,int *, const unsigned char *,unsigned int);
-void dlt_buffer_read_block(DltBuffer *, int *, unsigned char*, unsigned int);
+void dlt_buffer_write_block(DltBuffer *, int *, const unsigned char *, unsigned int);
+void dlt_buffer_read_block(DltBuffer *, int *, unsigned char *, unsigned int);
 void dlt_buffer_info(DltBuffer *);
 }
 
@@ -57,60 +63,70 @@ TEST(t_dlt_buffer_init_dynamic, normal)
 {
     DltBuffer init_dynamic;
 
-    // Normal Use-Case for initializing a buffer
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&init_dynamic, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&init_dynamic));
+    /* Normal Use-Case for initializing a buffer */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&init_dynamic, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&init_dynamic));
 
-    // Min Values for a success init
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&init_dynamic, 12,12,12));
-    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&init_dynamic));
+    /* Min Values for a success init */
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&init_dynamic, 12, 12, 12));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&init_dynamic));
 }
 TEST(t_dlt_buffer_init_dynamic, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Initialze buffer twice, expected -1 for second init
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//  EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf));
+    /* Initialze buffer twice, expected -1 for second init */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*  EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf)); */
 
-    // Initialize buffer with max-value of uint32, expected 0
-    // TODO: what should the maximum parameter values be? UINT_MAX is too large and leads to segfault
-//  EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, UINT_MAX,UINT_MAX,UINT_MAX));
-//  EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf));
+    /* Initialize buffer with max-value of uint32, expected 0 */
+    /* TODO: what should the maximum parameter values be? UINT_MAX is too large and leads to segfault */
+/*  EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, UINT_MAX,UINT_MAX,UINT_MAX)); */
+/*  EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf)); */
 
-    // Initialize buffer with min-value of uint32, expected 0
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, 0,0,0));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf));
+    /* Initialize buffer with min-value of uint32, expected 0 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, 0,0,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf)); */
 
-    // Initialize buffer min-value > max-value, expected -1
-//    EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf));
+    /* Initialize buffer min-value > max-value, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf)); */
 
-    // Initialsize buffer step-value > max-value, expected -1
-//    EXPECT_GE(-1,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE * 2));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf));
+    /* Initialsize buffer step-value > max-value, expected -1 */
+/*    EXPECT_GE(-1,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE * 2)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_init_dynamic, nullpointer)
 {
     DltBuffer buf;
 
-    // NULL-Pointer, expect -1
+    /* NULL-Pointer, expect -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, 0, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, 0, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(NULL, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, 0, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, 0, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, 0, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(&buf, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, 0, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
 }
 /* End Method: dlt_common::dlt_buffer_init_dynamic */
 
@@ -122,30 +138,32 @@ TEST(t_dlt_buffer_free_dynamic, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case szenario
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case szenario */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case szenario
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, 12,12,12));
+    /* Normal Use-Case szenario */
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, 12, 12, 12));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_free_dynamic, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Free uninizialised buffer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_free_dynamic(&buf));
+    /* Free uninizialised buffer, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_free_dynamic(&buf)); */
 
-   // Free buffer twice, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_GE(-1, dlt_buffer_free_dynamic(&buf));
+    /* Free buffer twice, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_GE(-1, dlt_buffer_free_dynamic(&buf)); */
 
 }
 TEST(t_dlt_buffer_free_dynamic, nullpointer)
 {
-    // NULL-POinter
+    /* NULL-POinter */
     EXPECT_GE(-1, dlt_buffer_free_dynamic(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_free_dynamic */
@@ -158,44 +176,50 @@ TEST(t_dlt_buffer_increase_size, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(0, dlt_buffer_increase_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Fill buffer to max-value, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(int i = 0; i <= (DLT_USER_RINGBUFFER_MAX_SIZE / DLT_USER_RINGBUFFER_MIN_SIZE); i += DLT_USER_RINGBUFFER_STEP_SIZE)
-    {
+    /* Fill buffer to max-value, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (int i = 0;
+         i <= (DLT_USER_RINGBUFFER_MAX_SIZE / DLT_USER_RINGBUFFER_MIN_SIZE);
+         i += DLT_USER_RINGBUFFER_STEP_SIZE)
         EXPECT_LE(0, dlt_buffer_increase_size(&buf));
-    }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_increase_size, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Increase uninizialised buffer
-//    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
+    /* Increase uninizialised buffer */
+/*    EXPECT_GE(-1, dlt_buffer_increase_size(&buf)); */
 
-    // Fill buffer over max-value, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* Fill buffer over max-value, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_increase_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // min-value > max-value, trying to increase buffer, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* min-value > max-value, trying to increase buffer, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_increase_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // trying to increase buffer with 0 , expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-//    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* trying to increase buffer with 0 , expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); */
+/*    EXPECT_GE(-1, dlt_buffer_increase_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_increase_size, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(-1, dlt_buffer_increase_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_increase_size */
@@ -208,44 +232,50 @@ TEST(t_dlt_buffer_minimize_size, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(0, dlt_buffer_minimize_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // minimize buffer to min-value, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(int i = (DLT_USER_RINGBUFFER_MAX_SIZE / DLT_USER_RINGBUFFER_MIN_SIZE); i >= 0; i -= DLT_USER_RINGBUFFER_STEP_SIZE)
-    {
+    /* minimize buffer to min-value, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (int i = (DLT_USER_RINGBUFFER_MAX_SIZE / DLT_USER_RINGBUFFER_MIN_SIZE);
+         i >= 0;
+         i -= DLT_USER_RINGBUFFER_STEP_SIZE)
         EXPECT_LE(0, dlt_buffer_minimize_size(&buf));
-    }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_minimize_size, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Minimize uninizialised buffer
-//    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf));
+    /* Minimize uninizialised buffer */
+/*    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf)); */
 
-    // minimize buffer under min-value, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* minimize buffer under min-value, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // min-value > max-value, trying to minimize buffer, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* min-value > max-value, trying to minimize buffer, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // trying to minimize buffer with 0 , expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-//    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* trying to minimize buffer with 0 , expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); */
+/*    EXPECT_GE(-1, dlt_buffer_minimize_size(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_minimize_size, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(-1, dlt_buffer_minimize_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_minimize_size */
@@ -258,21 +288,23 @@ TEST(t_dlt_buffer_reset, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case. expect 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case. expect 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(0, dlt_buffer_reset(&buf));
 
 }
 TEST(t_dlt_buffer_reset, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    //Use uninizialsied buffer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_reset(&buf));
+    /*Use uninizialsied buffer, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_reset(&buf)); */
 }
 TEST(t_dlt_buffer_reset, nullpointer)
 {
-    //Use NULL-Pointer, expected -1
+    /*Use NULL-Pointer, expected -1 */
     EXPECT_GE(-1, dlt_buffer_reset(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_reset */
@@ -284,72 +316,76 @@ TEST(t_dlt_buffer_reset, nullpointer)
 TEST(t_dlt_buffer_push, normal)
 {
     DltBuffer buf;
-    char * test;
+    char *test;
     unsigned int size = sizeof(test);
 
-    // Normal Use-Case, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&test,size));
+    /* Normal Use-Case, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&test, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Push till buffer is full, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(unsigned int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size); i++)
-    {
-        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&test,size));
-    }
+    /* Push till buffer is full, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (unsigned int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / size); i++)
+        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&test, size));
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_push, abnormal)
 {
-//    DltBuffer buf;
-//    char * test;
-//    int size = sizeof(test);
+/*    DltBuffer buf; */
+/*    char * test; */
+/*    int size = sizeof(test); */
 
-    // Use uninizialsied, expected -1
-//    EXPECT_GE(-1, dlt_buffer_push(&buf,(unsigned char *)&test,size));
+    /* Use uninizialsied, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_push(&buf,(unsigned char *)&test,size)); */
 
 
-    // set size == 0, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* set size == 0, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // set size == 0 and char == 0 expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,0,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* set size == 0 and char == 0 expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,0,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // Push till buffer is overfilled , expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size) + size; i++)
-//    {
-//        if(i <= DLT_USER_RINGBUFFER_MIN_SIZE)
-//            EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&test,size));
-//        else
-//            EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,(unsigned char *)&test,size));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* Push till buffer is overfilled , expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size) + size; i++) */
+/*    { */
+/*        if(i <= DLT_USER_RINGBUFFER_MIN_SIZE) */
+/*            EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&test,size)); */
+/*        else */
+/*            EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,(unsigned char *)&test,size)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // All use-case, wich works with null pointer, has to discuss
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* All use-case, wich works with null pointer, has to discuss */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(&buf,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
 }
 TEST(t_dlt_buffer_push, nullpointer)
 {
-    char * test;
+    char *test;
     int size = sizeof(test);
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL,(unsigned char *)&test,size));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push(NULL, (unsigned char *)&test, size));
 }
 /* End Method: dlt_common::dlt_buffer_push*/
 
@@ -360,299 +396,346 @@ TEST(t_dlt_buffer_push, nullpointer)
 TEST(t_dlt_buffer_push3, normal)
 {
     DltBuffer buf;
-    char * test;
+    char *test;
     int size = sizeof(test);
 
-    // Normal Use-Case, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf,(unsigned char *)&test,size,0,0,0,0));
+    /* Normal Use-Case, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf, (unsigned char *)&test, size, 0, 0, 0, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_push3(&buf, (unsigned char *)&test, size, (unsigned char *)&test, size, (unsigned char *)&test,
+                               size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Push till buffer is full, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size); i++)
-    {
-        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-    }
+    /* Push till buffer is full, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (int i = 0; i <= (DLT_USER_RINGBUFFER_MIN_SIZE / size); i++)
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_buffer_push3(&buf, (unsigned char *)&test, size, (unsigned char *)&test, size,
+                                   (unsigned char *)&test,
+                                   size));
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_push3, abnormal)
 {
-//    DltBuffer buf;
-//    char * test;
-//    int size = sizeof(test);
-
-    // Use uninizialsied, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-
-
-    // set size == 0, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0, (unsigned char *)&test,0, (unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-
-    // set size == 0 and char == 0 expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,0,0,0,0,0,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-
-    // works with null pointer, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-
-    // Push till buffer is overfilled , expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size) + size; i++)
-//    {
-//        if(i <= DLT_USER_RINGBUFFER_MIN_SIZE)
-//            EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-//        else
-//            EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-
-    // All use-case, wich works with null pointer, has to discuss
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-//    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+/*    DltBuffer buf; */
+/*    char * test; */
+/*    int size = sizeof(test); */
+
+    /* Use uninizialsied, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); */
+
+
+    /* set size == 0, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0, (unsigned char *)&test,0, (unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+
+    /* set size == 0 and char == 0 expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,0,0,0,0,0,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+
+    /* works with null pointer, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+
+    /* Push till buffer is overfilled , expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size) + size; i++) */
+/*    { */
+/*        if(i <= DLT_USER_RINGBUFFER_MIN_SIZE) */
+/*            EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); */
+/*        else */
+/*            EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+
+    /* All use-case, wich works with null pointer, has to discuss */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_push3, nullpointer)
 {
-    char * test;
+    char *test;
     int size = sizeof(test);
 
-    //Null Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,NULL,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,NULL,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,size));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
+    /*Null Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, NULL, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, 0, (unsigned char *)&test, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, NULL, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, NULL, size, (unsigned char *)&test, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, NULL, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, 0, (unsigned char *)&test,
+                               size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, size, (unsigned char *)&test,
+                               0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, 0, (unsigned char *)&test, size, (unsigned char *)&test,
+                               size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, 0, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, 0, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, size, (unsigned char *)&test, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, NULL, size, (unsigned char *)&test, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, 0, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, 0, (unsigned char *)&test,
+                               0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, 0, (unsigned char *)&test,
+                               size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, size, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, size, NULL, size));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, size, (unsigned char *)&test,
+                               0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_buffer_push3(NULL, (unsigned char *)&test, size, (unsigned char *)&test, size, (unsigned char *)&test,
+                               size));
 }
 /* End Method: dlt_common::dlt_buffer_push3 */
 
@@ -662,55 +745,63 @@ TEST(t_dlt_buffer_push3, nullpointer)
 /* Begin Method: dlt_common::dlt_buffer_pull */
 TEST(t_dlt_buffer_pull, normal)
 {
-    //Normal Use Cases, expected 0 or -1 in return
+    /*Normal Use Cases, expected 0 or -1 in return */
     DltBuffer buf;
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // Normal Use-Case, empty pull, expected -1
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char*)&header, size));
+    /* Normal Use-Case, empty pull, expected -1 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char *)&header, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-    EXPECT_LE(1, dlt_buffer_pull(&buf, (unsigned char*)&header, size));
+    /* Normal Use-Case, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+    EXPECT_LE(1, dlt_buffer_pull(&buf, (unsigned char *)&header, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_pull, abnormal)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
+/*    DltBuffer buf; */
+/*    DltUserHeader header; */
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char*)&header, sizeof(DltUserHeader)));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char*)&header, sizeof(DltUserHeader))); */
 
-    // data == 0 and max_size == 0, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-//    EXPECT_GE(-1, dlt_buffer_pull(&buf, 0, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* data == 0 and max_size == 0, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader))); */
+/*    EXPECT_GE(-1, dlt_buffer_pull(&buf, 0, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 
-    // no push before pull, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_pull(&buf, 0, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* no push before pull, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_pull(&buf, 0, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_pull, nullpointer)
 {
     DltBuffer buf;
     DltUserHeader header;
 
-    // NULL-Point, expected -1
+    /* NULL-Point, expected -1 */
     EXPECT_GE(-1, dlt_buffer_pull(NULL, NULL, 0));
     EXPECT_GE(-1, dlt_buffer_pull(NULL, NULL, sizeof(DltUserHeader)));
     EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, 0));
     EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, sizeof(DltUserHeader)));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, sizeof(DltUserHeader)));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
@@ -725,47 +816,51 @@ TEST(t_dlt_buffer_remove, normal)
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // Normal Use-Case, empty pull, expected -1
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case, empty pull, expected -1 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_remove(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
+    /* Normal Use-Case, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, size));
     EXPECT_LE(0, dlt_buffer_remove(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_remove, abnormal)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
-//    int size = sizeof(DltUserHeader);
-
-    // Uninizialised, expected -1
-//    EXPECT_GE(-1, dlt_buffer_remove(&buf));
-
-    // no push before remove, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_GE(-1, dlt_buffer_remove(&buf));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-
-    // Call remove 10 time, expected > 1 till buffer is empty
-    // pushed one time so expect one > 1 and 9 times < 0
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-//    for(int i=0; i<10;i++)
-//    {
-//        if(i == 0)
-//            EXPECT_LE(1, dlt_buffer_remove(&buf));
-//        else
-//            EXPECT_GE(-1, dlt_buffer_remove(&buf));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+/*    DltBuffer buf; */
+/*    DltUserHeader header; */
+/*    int size = sizeof(DltUserHeader); */
+
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_remove(&buf)); */
+
+    /* no push before remove, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_GE(-1, dlt_buffer_remove(&buf)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
+
+    /* Call remove 10 time, expected > 1 till buffer is empty */
+    /* pushed one time so expect one > 1 and 9 times < 0 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size)); */
+/*    for(int i=0; i<10;i++) */
+/*    { */
+/*        if(i == 0) */
+/*            EXPECT_LE(1, dlt_buffer_remove(&buf)); */
+/*        else */
+/*            EXPECT_GE(-1, dlt_buffer_remove(&buf)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_remove, nullpointer)
 {
-    // NULL_Pointer, expected -1
+    /* NULL_Pointer, expected -1 */
     EXPECT_GE(-1, dlt_buffer_remove(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_remove*/
@@ -780,30 +875,34 @@ TEST(t_dlt_buffer_copy, normal)
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // Normal Use-Case, empty pull, expected -1
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case, empty pull, expected -1 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_copy(&buf, (unsigned char *)&header, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
+    /* Normal Use-Case, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
     EXPECT_LE(1, dlt_buffer_copy(&buf, (unsigned char *)&header, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_copy, abnormal)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
-//    int size = sizeof(DltUserHeader);
+/*    DltBuffer buf; */
+/*    DltUserHeader header; */
+/*    int size = sizeof(DltUserHeader); */
 
-    // Uninizialised buffer , expected -1
-//    EXPECT_LE(-1, dlt_buffer_copy(&buf, (unsigned char *)&header, size));
+    /* Uninizialised buffer , expected -1 */
+/*    EXPECT_LE(-1, dlt_buffer_copy(&buf, (unsigned char *)&header, size)); */
 
-    // no push before copy, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(-1, dlt_buffer_copy(&buf, (unsigned char *)&header, size));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* no push before copy, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(-1, dlt_buffer_copy(&buf, (unsigned char *)&header, size)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_copy, nullpointer)
 {
@@ -811,16 +910,20 @@ TEST(t_dlt_buffer_copy, nullpointer)
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // NULL-Pointer, expected -1
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,NULL,size));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,NULL,0));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,(unsigned char *)&header,size));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,(unsigned char *)&header,0));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf,NULL,size));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL, NULL, size));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL, NULL, 0));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL, (unsigned char *)&header, size));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL, (unsigned char *)&header, 0));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf, NULL, size));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf,NULL,0));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_copy */
@@ -835,99 +938,123 @@ TEST(t_dlt_buffer_get, normal)
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // Normal Use-Case
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
+    /* Normal Use-Case */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, size));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    EXPECT_LE(0, dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, size));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    EXPECT_LE(0, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[0] = 50000;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[0] = 50000;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[1] = 50000;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[1] = 50000;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[2] = -50000;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[2] = -50000;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[2] = 0;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[2] = 0;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[0] = 4000;
-    ((int*)(buf.shm))[1] = 5000;
-    ((int*)(buf.shm))[2] = 0;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[0] = 4000;
+    ((int *)(buf.shm))[1] = 5000;
+    ((int *)(buf.shm))[2] = 0;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[0] = 10;
-    ((int*)(buf.shm))[1] = 5;
-    ((int*)(buf.shm))[2] = 5;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[0] = 10;
+    ((int *)(buf.shm))[1] = 5;
+    ((int *)(buf.shm))[2] = 5;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[2] = 50000;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[2] = 50000;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[0] = 19;
-    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, size));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[0] = 19;
+    EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char *)&header, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-    ((int*)(buf.shm))[2] = 19;
-    EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,5,1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, size));
+    printf("#### %i\n", dlt_buffer_get(&buf, (unsigned char *)&header, size, 0));
+    ((int *)(buf.shm))[2] = 19;
+    EXPECT_LE(0, dlt_buffer_get(&buf, (unsigned char *)&header, 5, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_get, abnormal)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
-//    int size = sizeof(DltUserHeader);
+/*    DltBuffer buf; */
+/*    DltUserHeader header; */
+/*    int size = sizeof(DltUserHeader); */
 
-    // Uninizialsied, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char *)&header,size, 0));
+    /* Uninizialsied, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char *)&header,size, 0)); */
 
-    // Integer with 12345678
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size));
-//    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0));
-//    EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,12345678));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
+    /* Integer with 12345678 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,size)); */
+/*    printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); */
+/*    EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,12345678)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); */
 }
 TEST(t_dlt_buffer_get, nullpointer)
 {
@@ -935,25 +1062,33 @@ TEST(t_dlt_buffer_get, nullpointer)
     DltUserHeader header;
     int size = sizeof(DltUserHeader);
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, 0, 0));
     EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, 0, 1));
     EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, size, 0));
     EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, size, 1));
-    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, 0, 0));
-    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, 0, 1));
-    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, size, 0));
-    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, size, 1));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char *)&header, 0, 0));
+    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char *)&header, 0, 1));
+    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char *)&header, size, 0));
+    EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char *)&header, size, 1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
@@ -968,41 +1103,48 @@ TEST(t_dlt_buffer_get_message_count, normal)
     DltBuffer buf;
     DltUserHeader header;
 
-    // Normal Usce-Case without pushing data, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    //printf("##### %i\n", dlt_buffer_get_message_count(&buf));
+    /* Normal Usce-Case without pushing data, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    /*printf("##### %i\n", dlt_buffer_get_message_count(&buf)); */
     EXPECT_LE(0, dlt_buffer_get_message_count(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case, with pushing data, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-    //printf("#### %i\n", dlt_buffer_get_message_count(&buf));
+    /* Normal Use-Case, with pushing data, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+    /*printf("#### %i\n", dlt_buffer_get_message_count(&buf)); */
     EXPECT_LE(0, dlt_buffer_get_message_count(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Pushing 1000 mesages, expected 10000
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(int i = 1; i <= 10000; i++)
-    {
-        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-        //printf("#### %i\n", dlt_buffer_get_message_count(&buf));
+    /* Pushing 1000 mesages, expected 10000 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (int i = 1; i <= 10000; i++) {
+        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+        /*printf("#### %i\n", dlt_buffer_get_message_count(&buf)); */
         EXPECT_LE(i, dlt_buffer_get_message_count(&buf));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
 }
 TEST(t_dlt_buffer_get_message_count, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get_message_count(&buf));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_get_message_count(&buf)); */
 }
 TEST(t_dlt_buffer_get_message_count, nullpointer)
 {
-    //NULL-Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get_message_count(NULL));
+    /*NULL-Pointer, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_get_message_count(NULL)); */
 }
 /* Begin MEthod: dlt_common::dlt_buffer_get_message_count */
 
@@ -1015,29 +1157,33 @@ TEST(t_dlt_buffer_get_total_size, normal)
     DltBuffer buf;
     DltUserHeader header;
 
-    // Normal Use-Case, expected max buffer size (DLT_USER_RINGBUFFER_MAX_SIZE)
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    //printf("##### %i\n", dlt_buffer_get_total_size(&buf));
+    /* Normal Use-Case, expected max buffer size (DLT_USER_RINGBUFFER_MAX_SIZE) */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    /*printf("##### %i\n", dlt_buffer_get_total_size(&buf)); */
     EXPECT_LE(DLT_USER_RINGBUFFER_MAX_SIZE, dlt_buffer_get_total_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case, 1st pushing data, expected max buffer size (DLT_USER_RINGBUFFER_MAX_SIZE)
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-    //printf("##### %i\n", dlt_buffer_get_total_size(&buf));
+    /* Normal Use-Case, 1st pushing data, expected max buffer size (DLT_USER_RINGBUFFER_MAX_SIZE) */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+    /*printf("##### %i\n", dlt_buffer_get_total_size(&buf)); */
     EXPECT_LE(DLT_USER_RINGBUFFER_MAX_SIZE, dlt_buffer_get_total_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_get_total_size, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get_total_size(&buf));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_get_total_size(&buf)); */
 }
 TEST(t_dlt_buffer_get_total_size, nullpointer)
 {
-    // NULL-Pointer, expect -1
+    /* NULL-Pointer, expect -1 */
     EXPECT_GE(-1, dlt_buffer_get_total_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_get_total_size*/
@@ -1050,39 +1196,46 @@ TEST(t_dlt_buffer_get_used_size, normal)
     DltBuffer buf;
     DltUserHeader header;
 
-    // Normal Use Cas buffer empty, expected 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    //printf("##### %i\n", dlt_buffer_get_used_size(&buf));
+    /* Normal Use Cas buffer empty, expected 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    /*printf("##### %i\n", dlt_buffer_get_used_size(&buf)); */
     EXPECT_LE(0, dlt_buffer_get_used_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case with pushing data, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(DLT_RETURN_OK,dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-    //printf("##### %i\n", dlt_buffer_get_used_size(&buf));
+    /* Normal Use-Case with pushing data, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+    /*printf("##### %i\n", dlt_buffer_get_used_size(&buf)); */
     EXPECT_LE(0, dlt_buffer_get_used_size(&buf));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    // Normal Use-Case with pushing 10000 data, expected > 0
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    for(int i = 1; i <= 10000; i++)
-    {
-        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader)));
-        //printf("#### %i\n", dlt_buffer_get_used_size(&buf));
+    /* Normal Use-Case with pushing 10000 data, expected > 0 */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+
+    for (int i = 1; i <= 10000; i++) {
+        EXPECT_LE(DLT_RETURN_OK, dlt_buffer_push(&buf, (unsigned char *)&header, sizeof(DltUserHeader)));
+        /*printf("#### %i\n", dlt_buffer_get_used_size(&buf)); */
         EXPECT_LE(1, dlt_buffer_get_used_size(&buf));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_get_used_size, abnormal)
 {
-//    DltBuffer buf;
+/*    DltBuffer buf; */
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get_used_size(&buf));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(-1, dlt_buffer_get_used_size(&buf)); */
 }
 TEST(t_dlt_buffer_get_used_size, nullpointer)
 {
-    //NULL-Pointer, expcted -1
+    /*NULL-Pointer, expcted -1 */
     EXPECT_GE(-1, dlt_buffer_get_used_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_get_used_size*/
@@ -1094,42 +1247,49 @@ TEST(t_dlt_buffer_get_used_size, nullpointer)
 TEST(t_dlt_buffer_write_block, normal)
 {
     DltBuffer buf;
-    unsigned char * data = NULL;
+    unsigned char *data = NULL;
     int write;
     int size1 = 516;
     int size2 = 1024;
 
-    // Normal Use-Case, void method, expected no error
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_NO_THROW(dlt_buffer_write_block(&buf,&write, data, size1));
+    /* Normal Use-Case, void method, expected no error */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, data, size1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_NO_THROW(dlt_buffer_write_block(&buf,&write, data, size2));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, data, size2));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    int tmp =0;
-    for(int i = 0; i<= 10000; i+=10)
-    {
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    int tmp = 0;
+
+    for (int i = 0; i <= 10000; i += 10) {
         tmp += i;
-        EXPECT_NO_THROW(dlt_buffer_write_block(&buf,&write, data, i));
+        EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, data, i));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_write_block, abnormal)
 {
-    // actual no abnormal test cases
-    // because of void funktion and missing gtest tools for that
+    /* actual no abnormal test cases */
+    /* because of void funktion and missing gtest tools for that */
 }
 TEST(t_dlt_buffer_write_block, nullpointer)
 {
     DltBuffer buf;
-    char * data;
+    char *data;
     int write;
     int test1 = 1000;
 
-    // NULL-Pointer, expected < 0
+    /* NULL-Pointer, expected < 0 */
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, NULL, NULL, 0));
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, NULL, NULL, test1));
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, 0));
@@ -1138,22 +1298,34 @@ TEST(t_dlt_buffer_write_block, nullpointer)
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, &write, NULL, test1));
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, 0));
     EXPECT_NO_THROW(dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, test1));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, NULL, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, NULL, NULL, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, NULL, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
@@ -1166,35 +1338,39 @@ TEST(t_dlt_buffer_write_block, nullpointer)
 TEST(t_dlt_buffer_read_block, normal)
 {
     DltBuffer buf;
-    unsigned char * data = NULL;
+    unsigned char *data = NULL;
     int write, read;
     int size1 = 516;
     int size2 = 1024;
 
-    // Normal Use-Case, void method, expected no error
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_NO_THROW(dlt_buffer_write_block(&buf,&write, data, size1));
-    EXPECT_NO_THROW(dlt_buffer_read_block(&buf,&write, data, size1));
+    /* Normal Use-Case, void method, expected no error */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &write, data, size1));
+    EXPECT_NO_THROW(dlt_buffer_read_block(&buf, &write, data, size1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_NO_THROW(dlt_buffer_write_block(&buf,&read, data, size2));
-    EXPECT_NO_THROW(dlt_buffer_read_block(&buf,&write, data, size2));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_NO_THROW(dlt_buffer_write_block(&buf, &read, data, size2));
+    EXPECT_NO_THROW(dlt_buffer_read_block(&buf, &write, data, size2));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_read_block, abnormal)
 {
-    // actual no abnormal test cases
-    // because of void funktion and missing gtest tools for that
+    /* actual no abnormal test cases */
+    /* because of void funktion and missing gtest tools for that */
 }
 TEST(t_dlt_buffer_read_block, nullpointer)
 {
     DltBuffer buf;
-    char * data;
+    char *data;
     int read = -1;
     int test1 = 1000;
 
-    // NULL-Pointer, expected < 0
+    /* NULL-Pointer, expected < 0 */
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, NULL, NULL, 0));
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, NULL, NULL, test1));
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, 0));
@@ -1203,25 +1379,39 @@ TEST(t_dlt_buffer_read_block, nullpointer)
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, &read, NULL, test1));
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, 0));
     EXPECT_NO_THROW(dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, test1));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, NULL, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, NULL, NULL, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, &read, NULL, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, &read, NULL, test1));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_read_block(&buf, &read, (unsigned char *)&data, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
@@ -1235,18 +1425,20 @@ TEST(t_dlt_buffer_info, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_info(&buf));
 }
 TEST(t_dlt_buffer_info, abnormal)
 {
-    // actually no abnormal test cases
-    // because of void function and missing gtest tools for that
+    /* actually no abnormal test cases */
+    /* because of void function and missing gtest tools for that */
 }
 TEST(t_dlt_buffer_info, nullpointer)
 {
-    // NULL-Pointer, no throw
+    /* NULL-Pointer, no throw */
     EXPECT_NO_THROW(dlt_buffer_info(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_info */
@@ -1259,18 +1451,20 @@ TEST(t_dlt_buffer_status, normal)
 {
     DltBuffer buf;
 
-    // Normal Use-Case
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    /* Normal Use-Case */
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_NO_THROW(dlt_buffer_status(&buf));
 }
 TEST(t_dlt_buffer_status, abnormal)
 {
-    // actual no abnormal test cases
-    // because of void funktion and missing gtest tools for that
+    /* actual no abnormal test cases */
+    /* because of void funktion and missing gtest tools for that */
 }
 TEST(t_dlt_buffer_status, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_NO_THROW(dlt_buffer_status(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_status */
@@ -1290,7 +1484,7 @@ TEST(t_dlt_message_init, normal)
 {
     DltMessage msg;
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg, 0));
 
@@ -1299,22 +1493,22 @@ TEST(t_dlt_message_init, normal)
 }
 TEST(t_dlt_message_init, abnormal)
 {
-//    DltMessage msg;
+/*    DltMessage msg; */
 
-    // Double use init, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,1));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,1));
+    /* Double use init, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,1)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,1)); */
 
-    // set Verbose to 12345678, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,12345678));
+    /* set Verbose to 12345678, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(&msg,12345678)); */
 }
 TEST(t_dlt_message_init, nullpointer)
 {
-    //NULL-Pointer, expected -1
+    /*NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_init(NULL, 1));
 }
@@ -1328,7 +1522,7 @@ TEST(t_dlt_message_free, normal)
 {
     DltMessage msg;
 
-    // Normal Use Case, expected 0
+    /* Normal Use Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg, 0));
 
@@ -1337,23 +1531,23 @@ TEST(t_dlt_message_free, normal)
 }
 TEST(t_dlt_message_free, abnormal)
 {
-//    DltMessage msg;
+/*    DltMessage msg; */
 
-    // Double use free, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,0));
+    /* Double use free, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,0)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,1));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_init(&msg,0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_message_free(&msg,1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,1)); */
 
-    // set Verbose to 12345678, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,12345678));
+    /* set Verbose to 12345678, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(&msg,12345678)); */
 }
 TEST(t_dlt_message_free, nullpointer)
 {
-    //NULL-Pointer, expected -1
+    /*NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_free(NULL, 1));
 }
@@ -1368,15 +1562,15 @@ TEST(t_dlt_file_open, normal)
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
@@ -1387,38 +1581,38 @@ TEST(t_dlt_file_open, normal)
 }
 TEST(t_dlt_file_open, abnormal)
 {
-//    DltFile file;
-//    /* Get PWD so file can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    DltFile file; */
+/*    / * Get PWD so file can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialsied, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 1));
+    /* Uninizialsied, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 1)); */
 
-    // Verbose set to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 12345678));
+    /* Verbose set to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, openfile, 12345678)); */
 
-    // Path doesn't exist, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, "This Path doesn't exist!!", 0));
+    /* Path doesn't exist, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(&file, "This Path doesn't exist!!", 0)); */
 }
 TEST(t_dlt_file_open, nullpointer)
 {
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(NULL, NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(NULL, NULL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_file_open(NULL, openfile, 0));
@@ -1440,58 +1634,60 @@ TEST(t_dlt_message_print_ascii, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_ascii, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_print_ascii, nullpointer)
 {
@@ -1500,27 +1696,27 @@ TEST(t_dlt_message_print_ascii, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,NULL,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,text,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,text,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,text,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL,text,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, text, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, text, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, text, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(NULL, text, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_ascii(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1));
 }
 /* End Method: dlt_common::dlt_message_print_ascii*/
 
@@ -1536,9 +1732,9 @@ TEST(t_dlt_message_print_ascii_with_filter, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -1546,32 +1742,34 @@ TEST(t_dlt_message_print_ascii_with_filter, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_ascii(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_ascii_with_filter, abnormal)
 {
-    // equal with t_dlt_message_print_ascii
+    /* equal with t_dlt_message_print_ascii */
 }
 TEST(t_dlt_message_print_ascii_with_filter, nullpointer)
 {
-    // equal with t_dlt_message_print_ascii
+    /* equal with t_dlt_message_print_ascii */
 }
 /* End Method: dlt_common::dlt_message_print_ascii with filter*/
 
@@ -1586,58 +1784,60 @@ TEST(t_dlt_message_print_header, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_header, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_print_header, nullpointer)
 {
@@ -1646,27 +1846,27 @@ TEST(t_dlt_message_print_header, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,NULL,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,text,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,text,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,text,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL,text,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, text, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, text, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, text, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(NULL, text, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_header(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1));
 
 }
 /* End Method: dlt_common::dlt_message_print_header */
@@ -1683,9 +1883,9 @@ TEST(t_dlt_message_print_header_with_filter, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -1693,32 +1893,34 @@ TEST(t_dlt_message_print_header_with_filter, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_header_with_filter, abnormal)
 {
-    // equal with t_dlt_message_print_header
+    /* equal with t_dlt_message_print_header */
 }
 TEST(t_dlt_message_print_header_with_filter, nullpointer)
 {
-    // equal with t_dlt_message_print_header
+    /* equal with t_dlt_message_print_header */
 }
 /* End Method: dlt_common::dlt_message_print_header with filter */
 
@@ -1733,58 +1935,60 @@ TEST(t_dlt_message_print_hex, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_hex, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_print_hex, nullpointer)
 {
@@ -1793,27 +1997,27 @@ TEST(t_dlt_message_print_hex, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,NULL,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,text,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,text,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,text,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL,text,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, text, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, text, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, text, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(NULL, text, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_hex(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1));
 }
 /* End Method: dlt_common::dlt_message_print_hex */
 
@@ -1830,9 +2034,9 @@ TEST(t_dlt_message_print_hex_with_filter, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -1840,32 +2044,34 @@ TEST(t_dlt_message_print_hex_with_filter, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_hex(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_hex_with_filter, abnormal)
 {
-    // equal with t_dlt_message_print_hex
+    /* equal with t_dlt_message_print_hex */
 }
 TEST(t_dlt_message_print_hex_with_filter, nullpointer)
 {
-    // equal with t_dlt_message_print_hex
+    /* equal with t_dlt_message_print_hex */
 }
 /* End Method: dlt_common::dlt_message_print_hex with filter */
 
@@ -1880,58 +2086,60 @@ TEST(t_dlt_message_print_mixed_plain, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_mixed_plain, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_print_mixed_plain, nullpointer)
 {
@@ -1940,27 +2148,27 @@ TEST(t_dlt_message_print_mixed_plain, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,NULL,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,text,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,text,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,text,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL,text,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, text, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, text, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, text, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(NULL, text, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_plain(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1));
 }
 /* End Method: dlt_common::dlt_message_print_mixed_pain */
 
@@ -1977,9 +2185,9 @@ TEST(t_dlt_message_print_mixed_plain_with_filter, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -1987,32 +2195,34 @@ TEST(t_dlt_message_print_mixed_plain_with_filter, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_plain(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_mixed_plain_with_filter, abnormal)
 {
-    // equal with t_dlt_message_print_mixed_plain
+    /* equal with t_dlt_message_print_mixed_plain */
 }
 TEST(t_dlt_message_print_mixed_plain_with_filter, nullpointer)
 {
-    // equal with t_dlt_message_print_mixed_plain
+    /* equal with t_dlt_message_print_mixed_plain */
 }
 /* End Method: dlt_common::dlt_message_print_mixed_pain with filter */
 
@@ -2026,58 +2236,60 @@ TEST(t_dlt_message_print_mixed_html, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_mixed_html, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_print_mixed_html, nullpointer)
 {
@@ -2086,27 +2298,27 @@ TEST(t_dlt_message_print_mixed_html, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,NULL,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,text,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,text,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,text,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL,text,DLT_DAEMON_TEXTSIZE,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg,NULL,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, text, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, text, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, text, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(NULL, text, DLT_DAEMON_TEXTSIZE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, NULL, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_print_mixed_html(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1));
 }
 /* End Method: dlt_common::dlt_message_print_mixed_html */
 
@@ -2122,9 +2334,9 @@ TEST(t_dlt_message_print_mixed_html_with_filter, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -2132,32 +2344,34 @@ TEST(t_dlt_message_print_mixed_html_with_filter, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_print_mixed_html(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_print_mixed_html_with_filter, abnormal)
 {
-    // equal with t_dlt_message_print_mixed_html
+    /* equal with t_dlt_message_print_mixed_html */
 }
 TEST(t_dlt_message_print_mixed_html_with_filter, nullpointer)
 {
-    // equal with t_dlt_message_print_mixed_html
+    /* equal with t_dlt_message_print_mixed_html */
 }
 /* End Method: dlt_common::dlt_message_print_mixed_html_with filter */
 
@@ -2172,9 +2386,9 @@ TEST(t_dlt_message_filter_check, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -2182,55 +2396,57 @@ TEST(t_dlt_message_filter_check, normal)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected > 0
+    /* Normal Use-Case, expected > 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_init(&filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_filter_load(&filter, openfilter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_set_filter(&file, &filter, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_filter_check(&file.msg, &filter, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_filter_check(&file.msg, &filter, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_filter_check, abnormal)
 {
-//    DltFile file;
-//    DltFilter filter;
+/*    DltFile file; */
+/*    DltFilter filter; */
 
     /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    char openfilter[117];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
-//    sprintf(openfilter, "%s/testfilter.txt", pwd);
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    char openfilter[117]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
+/*    sprintf(openfilter, "%s/testfilter.txt", pwd); */
     /*---------------------------------------*/
 
-    // No messages read, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 1));
+    /* No messages read, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 1)); */
 
-    // Set verbose to 12345678
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 12345678));
+    /* Set verbose to 12345678 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(&file.msg, &filter, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_filter_check, nullpointer)
 {
@@ -2239,9 +2455,9 @@ TEST(t_dlt_message_filter_check, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     char openfilter[117];
@@ -2249,7 +2465,7 @@ TEST(t_dlt_message_filter_check, nullpointer)
     sprintf(openfilter, "%s/testfilter.txt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(NULL, NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(NULL, NULL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_filter_check(NULL, &filter, 0));
@@ -2269,61 +2485,63 @@ TEST(t_dlt_message_get_extraparamters, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect >0
+    /* Normal Use-Case, expect >0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_get_extraparameters(&file.msg, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_get_extraparameters(&file.msg, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_get_extraparamters, abnormal)
 {
-//    DltFile file;
+/*    DltFile file; */
 
     /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 1));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 1)); */
 
-    // set verbose to 12345678, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 12345678));
+    /* set verbose to 12345678, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(&file.msg, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_get_extraparamters, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_get_extraparameters(NULL, 1));
 }
@@ -2340,61 +2558,63 @@ TEST(t_dlt_message_header, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-        printf("%s \n",text);
+        printf("%s \n", text);
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
-        printf("%s \n",text);
+        printf("%s \n", text);
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_header, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
     /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 1)); */
 
-    // set verbose to 12345678, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
+    /* set verbose to 12345678, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
 
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678));
-//        printf("%s \n",text);
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, 12345678)); */
+/*        printf("%s \n",text); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_header, nullpointer)
 {
@@ -2403,15 +2623,15 @@ TEST(t_dlt_message_header, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(NULL, NULL, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(NULL, NULL, 0, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0));
@@ -2436,18 +2656,18 @@ TEST(t_dlt_message_header, nullpointer)
 TEST(t_dlt_message_header_flags, normal)
 {
     /* Possible Flags*/
-    //#define DLT_HEADER_SHOW_NONE       0x0000
-    //#define DLT_HEADER_SHOW_TIME       0x0001
-    //#define DLT_HEADER_SHOW_TMSTP      0x0002
-    //#define DLT_HEADER_SHOW_MSGCNT     0x0004
-    //#define DLT_HEADER_SHOW_ECUID      0x0008
-    //#define DLT_HEADER_SHOW_APID       0x0010
-    //#define DLT_HEADER_SHOW_CTID       0x0020
-    //#define DLT_HEADER_SHOW_MSGTYPE    0x0040
-    //#define DLT_HEADER_SHOW_MSGSUBTYPE 0x0080
-    //#define DLT_HEADER_SHOW_VNVSTATUS  0x0100
-    //#define DLT_HEADER_SHOW_NOARG      0x0200
-    //#define DLT_HEADER_SHOW_ALL        0xFFFF
+    /*#define DLT_HEADER_SHOW_NONE       0x0000 */
+    /*#define DLT_HEADER_SHOW_TIME       0x0001 */
+    /*#define DLT_HEADER_SHOW_TMSTP      0x0002 */
+    /*#define DLT_HEADER_SHOW_MSGCNT     0x0004 */
+    /*#define DLT_HEADER_SHOW_ECUID      0x0008 */
+    /*#define DLT_HEADER_SHOW_APID       0x0010 */
+    /*#define DLT_HEADER_SHOW_CTID       0x0020 */
+    /*#define DLT_HEADER_SHOW_MSGTYPE    0x0040 */
+    /*#define DLT_HEADER_SHOW_MSGSUBTYPE 0x0080 */
+    /*#define DLT_HEADER_SHOW_VNVSTATUS  0x0100 */
+    /*#define DLT_HEADER_SHOW_NOARG      0x0200 */
+    /*#define DLT_HEADER_SHOW_ALL        0xFFFF */
     /*########################################*/
 
 
@@ -2456,127 +2676,153 @@ TEST(t_dlt_message_header_flags, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
-        printf("%s \n",text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
+        printf("%s \n", text);
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
-        printf("%s \n",text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
+        printf("%s \n", text);
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_header_flags, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
-//    /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];;
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    / * Get PWD so file and filter can be used* / */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114];; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
-
-    // USE own DLT_HEADER_SHOW , expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0x1234, 0));
-
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0x1234, 0));
-//        printf("%s \n",text);
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1)); */
+
+    /* USE own DLT_HEADER_SHOW , expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0x1234, 0)); */
+
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0x1234, 0)); */
+/*        printf("%s \n",text); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_header_flags, nullpointer)
 {
@@ -2585,15 +2831,15 @@ TEST(t_dlt_message_header_flags, nullpointer)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, 0, 0, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_NONE, 0));
@@ -2630,8 +2876,10 @@ TEST(t_dlt_message_header_flags, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
@@ -2642,8 +2890,10 @@ TEST(t_dlt_message_header_flags, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, 0, 0, 0));
@@ -2682,8 +2932,10 @@ TEST(t_dlt_message_header_flags, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
@@ -2694,8 +2946,10 @@ TEST(t_dlt_message_header_flags, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, 0, 0, 0));
@@ -2726,29 +2980,51 @@ TEST(t_dlt_message_header_flags, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_ALL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_header_flags(&file.msg, text, 0, 0, 1));
@@ -2786,11 +3062,11 @@ TEST(t_dlt_message_header_flags, nullpointer)
 TEST(t_dlt_message_payload, normal)
 {
     /* Types */
-    //#define DLT_OUTPUT_HEX              1
-    //#define DLT_OUTPUT_ASCII            2
-    //#define DLT_OUTPUT_MIXED_FOR_PLAIN  3
-    //#define DLT_OUTPUT_MIXED_FOR_HTML   4
-    //#define DLT_OUTPUT_ASCII_LIMITED    5
+    /*#define DLT_OUTPUT_HEX              1 */
+    /*#define DLT_OUTPUT_ASCII            2 */
+    /*#define DLT_OUTPUT_MIXED_FOR_PLAIN  3 */
+    /*#define DLT_OUTPUT_MIXED_FOR_HTML   4 */
+    /*#define DLT_OUTPUT_ASCII_LIMITED    5 */
     /*####################################*/
 
     DltFile file;
@@ -2798,107 +3074,115 @@ TEST(t_dlt_message_payload, normal)
 
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0));
-        printf("%s \n",text);
+        printf("%s \n", text);
         EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0));
-        printf("%s \n",text);
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0));
+        printf("%s \n", text);
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1));
-        printf("%s \n",text);
+        printf("%s \n", text);
         EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
-        printf("%s \n",text);
-        EXPECT_LE(DLT_RETURN_OK, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1));
-        printf("%s \n",text);
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
+        printf("%s \n", text);
+        EXPECT_LE(DLT_RETURN_OK,
+                  dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1));
+        printf("%s \n", text);
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_payload, abnormal)
 {
-//    DltFile file;
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
 
     /* Get PWD so file and filter can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1));
-
-    // USE own DLT_HEADER_SHOW , expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0));
-
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0));
-//        printf("%s \n",text);
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
-
-    // set verbose to 12345678
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 12345678));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 12345678));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 12345678));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 12345678));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1)); */
+
+    /* USE own DLT_HEADER_SHOW , expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0)); */
+
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0)); */
+/*        printf("%s \n",text); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
+
+    /* set verbose to 12345678 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 12345678)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 12345678)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 12345678)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 12345678)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_payload, nullpointer)
 {
     DltFile file;
     static char text[DLT_DAEMON_TEXTSIZE];
 
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(NULL, NULL, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(NULL, NULL, 0, 0, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_HEX, 0));
@@ -2963,13 +3247,17 @@ TEST(t_dlt_message_payload, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, 0, 0, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, 0, 0, 1));
@@ -2984,14 +3272,14 @@ TEST(t_dlt_message_payload, nullpointer)
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_MIXED_FOR_HTML, 1));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_ASCII_LIMITED, 1));
 
-    // file.msg is not initialised which causes problems when textsize is > 0 but
-    // we don't have text:
-    // dlt_common.c line 943: ptr = msg->databuffer;
-    // (gdb) p ptr
-    //    $28 = (uint8_t *) 0x5124010337d46c00 <error: Cannot access memory at address 0x5124010337d46c00>
+    /* file.msg is not initialised which causes problems when textsize is > 0 but */
+    /* we don't have text: */
+    /* dlt_common.c line 943: ptr = msg->databuffer; */
+    /* (gdb) p ptr */
+    /*    $28 = (uint8_t *) 0x5124010337d46c00 <error: Cannot access memory at address 0x5124010337d46c00> */
 
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 1));
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 1)); */
 }
 /* End Method:dlt_common::dlt_message_payload */
 
@@ -3004,58 +3292,60 @@ TEST(t_dlt_message_set_extraparamters, normal)
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_set_extraparameters(&file.msg, 0));
     }
-    for(int i=0;i<file.counter;i++)
-    {
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         EXPECT_LE(DLT_RETURN_OK, dlt_message_set_extraparameters(&file.msg, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_set_extraparamters, abnormal)
 {
-//    DltFile file;
-//    // Get PWD so file and filter can be used
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+/*    DltFile file; */
+/*    // Get PWD so file and filter can be used */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
     /*---------------------------------------*/
 
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 0));
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 1));
-
-    // set verbos to 12345678
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 12345678));
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 0)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 1)); */
+
+    /* set verbos to 12345678 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(&file.msg, 12345678)); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_set_extraparamters, nullpointer)
 {
-    // NULL-Pointer, expect -1
+    /* NULL-Pointer, expect -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(NULL, 0));
     EXPECT_GE(DLT_RETURN_ERROR, dlt_message_set_extraparameters(NULL, 1));
 }
@@ -3069,11 +3359,11 @@ TEST(t_dlt_message_set_extraparamters, nullpointer)
 TEST(t_dlt_message_read, normal)
 {
     DltFile file;
-    // Get PWD so file can be used
+    /* Get PWD so file can be used */
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
@@ -3082,40 +3372,46 @@ TEST(t_dlt_message_read, normal)
     DltBuffer buf;
     char *buffer = NULL;
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-        EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char*) buffer,255,0,1));
+        EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (unsigned char *)buffer, 255, 0, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 
-    EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE,
+                                      DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-        EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char *) buffer,255,1,1));
+        EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (unsigned char *)buffer, 255, 1, 1));
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_message_read, abnormal)
-{
-
-}
+{}
 TEST(t_dlt_message_read, nullpointer)
 {
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
@@ -3123,11 +3419,11 @@ TEST(t_dlt_message_read, nullpointer)
 
     DltBuffer buf;
 
-    // NULL_Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, NULL, 0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, (uint8_t *)&buf, 0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, NULL, 0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (uint8_t *)&buf, 0,0,0));
+    /* NULL_Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, (uint8_t *)&buf, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (uint8_t *)&buf, 0, 0, 0));
 
 }
 /* End Method:dlt_common::dlt_message_read */
@@ -3141,9 +3437,9 @@ TEST(t_dlt_message_argument_print, normal)
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
@@ -3154,80 +3450,88 @@ TEST(t_dlt_message_argument_print, normal)
     uint8_t **pptr;
     int32_t *pdatalength;
 
-    // Normal Use-Case, expect 0
+    /* Normal Use-Case, expect 0 */
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         ptr = file.msg.databuffer;
         datalength = file.msg.datasize;
         pptr = &ptr;
         pdatalength = &datalength;
-        EXPECT_GE(DLT_RETURN_OK, dlt_message_argument_print(&file.msg,DLT_TYPE_INFO_BOOL,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1));
-        //printf("### ARGUMENT:%s\n", text);
+        EXPECT_GE(DLT_RETURN_OK,
+                  dlt_message_argument_print(&file.msg, DLT_TYPE_INFO_BOOL, pptr, pdatalength, text,
+                                             DLT_DAEMON_TEXTSIZE, 0, 1));
+        /*printf("### ARGUMENT:%s\n", text); */
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 
     EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
     EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-    while (dlt_file_read(&file,0)>=0){}
-    for(int i=0;i<file.counter;i++)
-    {
+
+    while (dlt_file_read(&file, 0) >= 0) {}
+
+    for (int i = 0; i < file.counter; i++) {
         EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
         ptr = file.msg.databuffer;
         datalength = file.msg.datasize;
         pptr = &ptr;
         pdatalength = &datalength;
-        EXPECT_GE(DLT_RETURN_OK, dlt_message_argument_print(&file.msg,DLT_TYPE_INFO_RAWD,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1));
-        //printf("### ARGUMENT:%s\n", text);
+        EXPECT_GE(DLT_RETURN_OK,
+                  dlt_message_argument_print(&file.msg, DLT_TYPE_INFO_RAWD, pptr, pdatalength, text,
+                                             DLT_DAEMON_TEXTSIZE, 0, 1));
+        /*printf("### ARGUMENT:%s\n", text); */
     }
+
     EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 
 }
 TEST(t_dlt_message_argument_print, abnormal)
 {
-//    DltFile file;
-    // Get PWD so file and filter can be used
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char  openfile[114];
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
-//    static char text[DLT_DAEMON_TEXTSIZE];
+/*    DltFile file; */
+    /* Get PWD so file and filter can be used */
+/*    char pwd[100]; */
+/*    getcwd(pwd, 100); */
+/*    char  openfile[114]; */
+/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
+/*    static char text[DLT_DAEMON_TEXTSIZE]; */
     /*---------------------------------------*/
-//    uint8_t *ptr;
-//    int32_t datalength;
-//    uint8_t **pptr;
-//    int32_t *pdatalength;
-
-    // Uninizialised, expected -1
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,12345678,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1));
-
-    // Use a non defined type_info, expected -1
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
-//    while (dlt_file_read(&file,0)>=0){}
-//    for(int i=0;i<file.counter;i++)
-//    {
-//        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
-//        ptr = file.msg.databuffer;
-//        datalength = file.msg.datasize;
-//        pptr = &ptr;
-//        pdatalength = &datalength;
-//        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,12345678,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1));
-//        //printf("### ARGUMENT:%s\n", text);
-//    }
-//    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
+/*    uint8_t *ptr; */
+/*    int32_t datalength; */
+/*    uint8_t **pptr; */
+/*    int32_t *pdatalength; */
+
+    /* Uninizialised, expected -1 */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,12345678,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1)); */
+
+    /* Use a non defined type_info, expected -1 */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
+/*    while (dlt_file_read(&file,0)>=0){} */
+/*    for(int i=0;i<file.counter;i++) */
+/*    { */
+/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
+/*        ptr = file.msg.databuffer; */
+/*        datalength = file.msg.datasize; */
+/*        pptr = &ptr; */
+/*        pdatalength = &datalength; */
+/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,12345678,pptr,pdatalength,text,DLT_DAEMON_TEXTSIZE,0,1)); */
+/*        //printf("### ARGUMENT:%s\n", text); */
+/*    } */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
 }
 TEST(t_dlt_message_argument_print, nullpointer)
 {
     DltFile file;
     /* Get PWD so file can be used*/
     char pwd[100];
-    char  openfile[114];
+    char openfile[114];
 
-    // ignore returned value from getcwd
+    /* ignore returned value from getcwd */
     if (getcwd(pwd, 100) == NULL) {}
 
     sprintf(openfile, "%s/testfile.dlt", pwd);
@@ -3240,23 +3544,23 @@ TEST(t_dlt_message_argument_print, nullpointer)
     pptr = &ptr;
     pdatalength = &datalength;
 
-    // NULL-Pointer, expected -1
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,NULL,NULL,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,NULL,NULL,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,NULL,pdatalength,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,NULL,pdatalength,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,pptr,NULL,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,pptr,NULL,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,pptr,pdatalength,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL,0,pptr,pdatalength,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,NULL,NULL,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,NULL,NULL,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,NULL,pdatalength,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,NULL,pdatalength,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,pptr,NULL,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,pptr,NULL,text,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,pptr,pdatalength,NULL,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg,0,pptr,pdatalength,text,0,0,0));
+    /* NULL-Pointer, expected -1 */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, NULL, NULL, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, NULL, NULL, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, NULL, pdatalength, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, NULL, pdatalength, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, pptr, NULL, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, pptr, NULL, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, pptr, pdatalength, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(NULL, 0, pptr, pdatalength, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, NULL, NULL, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, NULL, NULL, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, NULL, pdatalength, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, NULL, pdatalength, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, pptr, NULL, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, pptr, NULL, text, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, pptr, pdatalength, NULL, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_argument_print(&file.msg, 0, pptr, pdatalength, text, 0, 0, 0));
 }
 /* End Method:dlt_common::dlt_message_argument_print */
 
@@ -3274,13 +3578,13 @@ TEST(t_dlt_message_argument_print, nullpointer)
 TEST(t_dlt_log_set_level, normal)
 {
     /* Possible Falgs */
-    // DLT_LOG_TO_CONSOLE=0,
-    // DLT_LOG_TO_SYSLOG=1,
-    // DLT_LOG_TO_FILE=2,
-    // DLT_LOG_DROPPED=3
-    //#######################
+    /* DLT_LOG_TO_CONSOLE=0, */
+    /* DLT_LOG_TO_SYSLOG=1, */
+    /* DLT_LOG_TO_FILE=2, */
+    /* DLT_LOG_DROPPED=3 */
+    /*####################### */
 
-    // Normal Use-Case, expcect 0-3
+    /* Normal Use-Case, expcect 0-3 */
     EXPECT_NO_THROW(dlt_log_set_level(DLT_LOG_TO_CONSOLE));
     EXPECT_NO_THROW(dlt_log_set_level(DLT_LOG_TO_SYSLOG));
     EXPECT_NO_THROW(dlt_log_set_level(DLT_LOG_TO_FILE));
@@ -3288,12 +3592,12 @@ TEST(t_dlt_log_set_level, normal)
 }
 TEST(t_dlt_log_set_level, abnormal)
 {
-    // actual no test cases
-    // because of void method and missing gtest function
+    /* actual no test cases */
+    /* because of void method and missing gtest function */
 }
 TEST(t_dlt_log_set_level, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
 }
 /* End Method:dlt_common::dlt_log_set_level */
 
@@ -3304,18 +3608,18 @@ TEST(t_dlt_log_set_level, nullpointer)
 /* Begin MEthod:dlt_common::dlt_log_set_filename */
 TEST(dlt_log_set_filename, normal)
 {
-    // Normal Use-Case, exptected PATH
-    const char * filename = "/tmp/dlt.log";
+    /* Normal Use-Case, exptected PATH */
+    const char *filename = "/tmp/dlt.log";
     EXPECT_NO_THROW(dlt_log_set_filename(filename));
 }
 TEST(dlt_log_set_filename, abnormal)
 {
-    // actual no test cases
-    // because of void method and missing gtest function
+    /* actual no test cases */
+    /* because of void method and missing gtest function */
 }
 TEST(dlt_log_set_filename, nullpointer)
 {
-    // NULL-Pointer, expected -1 or "no file"
+    /* NULL-Pointer, expected -1 or "no file" */
     EXPECT_NO_THROW(dlt_log_set_filename(NULL));
 }
 /* End MEthod:dlt_common::dlt_log_set_filename */
@@ -3327,13 +3631,13 @@ TEST(dlt_log_set_filename, nullpointer)
 TEST(t_dlt_log_init, normal)
 {
     /* Possible Falgs */
-    // DLT_LOG_TO_CONSOLE=0,
-    // DLT_LOG_TO_SYSLOG=1,
-    // DLT_LOG_TO_FILE=2,
-    // DLT_LOG_DROPPED=3
-    //#######################
+    /* DLT_LOG_TO_CONSOLE=0, */
+    /* DLT_LOG_TO_SYSLOG=1, */
+    /* DLT_LOG_TO_FILE=2, */
+    /* DLT_LOG_DROPPED=3 */
+    /*####################### */
 
-    // Normal Use-Case, exptect 0-3
+    /* Normal Use-Case, exptect 0-3 */
     EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE));
     EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG));
     EXPECT_NO_THROW(dlt_log_set_filename("/tmp/dlt.log"));
@@ -3343,12 +3647,12 @@ TEST(t_dlt_log_init, normal)
 }
 TEST(t_dlt_log_init, abnormal)
 {
-    // actual no test cases
-    // because of void method and missing gtest function
+    /* actual no test cases */
+    /* because of void method and missing gtest function */
 }
 TEST(t_dlt_log_init, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
 }
 /* End Method: dlt_common::dlt_log_init */
 
@@ -3359,25 +3663,25 @@ TEST(t_dlt_log_init, nullpointer)
 TEST(t_dlt_log_free, normal)
 {
     /* Possible Falgs */
-    // DLT_LOG_TO_CONSOLE=0,
-    // DLT_LOG_TO_SYSLOG=1,
-    // DLT_LOG_TO_FILE=2,
-    // DLT_LOG_DROPPED=3
-    //#######################
+    /* DLT_LOG_TO_CONSOLE=0, */
+    /* DLT_LOG_TO_SYSLOG=1, */
+    /* DLT_LOG_TO_FILE=2, */
+    /* DLT_LOG_DROPPED=3 */
+    /*####################### */
 
-    // Normal Use-Case, expected 0
+    /* Normal Use-Case, expected 0 */
     EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE));
     EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG));
     EXPECT_NO_THROW(dlt_log_init(DLT_LOG_DROPPED));
 }
 TEST(t_dlt_log_free, abnormal)
 {
-    // actual no test cases
-    // because of void method and missing gtest function
+    /* actual no test cases */
+    /* because of void method and missing gtest function */
 }
 TEST(t_dlt_log_free, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
 }
 /* End Method:dlt_common::dlt_log_free */
 
@@ -3388,55 +3692,55 @@ TEST(t_dlt_log_free, nullpointer)
 TEST(t_dlt_log, normal)
 {
     /* Possible Falgs */
-    // #define  LOG_EMERG   0
-    // #define  LOG_ALERT   1
-    // #define  LOG_CRIT    2
-    // #define  LOG_ERR     3
-    // #define  LOG_WARNING 4
-    // #define  LOG_NOTICE  5
-    // #define  LOG_INFO    6
-    // #define  LOG_DEBUG   7
-
-    const char * EMERG = "SYSLOG EMERG\n";
-    const char * ALERT = "SYSLOG ALERT\n";
-    const char * CRIT = "SYSLOG CRIT\n";
-    const char * ERR = "SYSLOG ERR\n";
-    const char * WARNING = "SYSLOG WARNING\n";
-    const char * NOTICE = "SYSLOG NOTICE\n";
-    const char * INFO = "SYSLOG INFO\n";
-    const char * DEBUG = "SYSLOG DEBUG\n";
-
-    // Normal Use-Case, expected 0
+    /* #define  LOG_EMERG   0 */
+    /* #define  LOG_ALERT   1 */
+    /* #define  LOG_CRIT    2 */
+    /* #define  LOG_ERR     3 */
+    /* #define  LOG_WARNING 4 */
+    /* #define  LOG_NOTICE  5 */
+    /* #define  LOG_INFO    6 */
+    /* #define  LOG_DEBUG   7 */
+
+    const char *EMERG = "SYSLOG EMERG\n";
+    const char *ALERT = "SYSLOG ALERT\n";
+    const char *CRIT = "SYSLOG CRIT\n";
+    const char *ERR = "SYSLOG ERR\n";
+    const char *WARNING = "SYSLOG WARNING\n";
+    const char *NOTICE = "SYSLOG NOTICE\n";
+    const char *INFO = "SYSLOG INFO\n";
+    const char *DEBUG = "SYSLOG DEBUG\n";
+
+    /* Normal Use-Case, expected 0 */
     dlt_log_init(DLT_LOG_TO_CONSOLE);
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_EMERG, (char *) EMERG));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ALERT, (char *) ALERT));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_CRIT, (char *) CRIT));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ERR, (char *) ERR));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_WARNING, (char *) WARNING));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_NOTICE, (char *) NOTICE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_INFO, (char *) INFO));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_DEBUG, (char *) DEBUG));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_EMERG, (char *)EMERG));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ALERT, (char *)ALERT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_CRIT, (char *)CRIT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ERR, (char *)ERR));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_WARNING, (char *)WARNING));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_NOTICE, (char *)NOTICE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_INFO, (char *)INFO));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_DEBUG, (char *)DEBUG));
 
     dlt_log_init(DLT_LOG_DROPPED);
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_EMERG, (char *) EMERG));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ALERT, (char *) ALERT));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_CRIT, (char *) CRIT));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ERR, (char *) ERR));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_WARNING, (char *) WARNING));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_NOTICE, (char *) NOTICE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_INFO, (char *) INFO));
-    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_DEBUG, (char *) DEBUG));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_EMERG, (char *)EMERG));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ALERT, (char *)ALERT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_CRIT, (char *)CRIT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_ERR, (char *)ERR));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_WARNING, (char *)WARNING));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_NOTICE, (char *)NOTICE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_INFO, (char *)INFO));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log(LOG_DEBUG, (char *)DEBUG));
 }
 TEST(t_dlt_log, abnormal)
 {
-    // LOG MODE don't exists, expected -1
-//    int DLT_LOG_DONT_EXISTS = 123456789;
-//    const char * EXIST = "SYSLOG DONT EXISTS\n";
-//    EXPECT_GE(DLT_RETURN_ERROR, dlt_log(DLT_LOG_DONT_EXISTS, (char *) EXIST));
+    /* LOG MODE don't exists, expected -1 */
+/*    int DLT_LOG_DONT_EXISTS = 123456789; */
+/*    const char * EXIST = "SYSLOG DONT EXISTS\n"; */
+/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_log(DLT_LOG_DONT_EXISTS, (char *) EXIST)); */
 }
 TEST(t_dlt_log, nullpointer)
 {
-    // NULL-Pointer, expected -1
+    /* NULL-Pointer, expected -1 */
     EXPECT_GE(DLT_RETURN_ERROR, dlt_log(0, NULL));
 }
 /* End Method: dlt_common::dlt_log_init_init */
@@ -3456,13 +3760,9 @@ TEST(t_dlt_uptime, normal)
     EXPECT_LE(1, dlt_uptime());
 }
 TEST(t_dlt_uptime, abnormal)
-{
-
-}
+{}
 TEST(t_dlt_uptime, nullpointer)
-{
-
-}
+{}
 /* End Method:dlt_common::dlt_uptime */
 
 
@@ -3471,22 +3771,22 @@ TEST(t_dlt_uptime, nullpointer)
 /* Begin Method:dlt_common::dlt_set_id */
 TEST(t_dlt_set_id, normal)
 {
-//    char id[4];
-//    const char * text = "DLTD";
-//    dlt_set_id(id, text);
-//    EXPECT_STREQ(text, id);
+/*    char id[4]; */
+/*    const char * text = "DLTD"; */
+/*    dlt_set_id(id, text); */
+/*    EXPECT_STREQ(text, id); */
 }
 TEST(t_dlt_set_id, abnormal)
 {
-//    char id[10];
-//    const char * text = "1234567890";
-//    dlt_set_id(id, text);
-//    EXPECT_STRNE(text, id);
+/*    char id[10]; */
+/*    const char * text = "1234567890"; */
+/*    dlt_set_id(id, text); */
+/*    EXPECT_STRNE(text, id); */
 }
 TEST(t_dlt_set_id, nullpointer)
 {
     char id[4];
-    const char * text = "TEST";
+    const char *text = "TEST";
 
     EXPECT_NO_THROW(dlt_set_id(NULL, NULL));
     EXPECT_NO_THROW(dlt_set_id(NULL, text));
@@ -3500,103 +3800,105 @@ TEST(t_dlt_set_id, nullpointer)
 /* Begin Method:dlt_common::dlt_print_hex_string */
 TEST(t_dlt_print_hex_string, normal)
 {
-    // Normal Use-Case, exptect 0
-    const char * test1 = "HELLO_HEX";
+    /* Normal Use-Case, exptect 0 */
+    const char *test1 = "HELLO_HEX";
     char text1[DLT_DAEMON_TEXTSIZE];
     EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text1, DLT_DAEMON_TEXTSIZE, (unsigned char *)test1, strlen(test1)));
-    //printf("text:%s\n", text1);
-    // convert text1 to an ascii string to compare with the original
-    char * converted = (char*) malloc(strlen(test1) +1);
+    /*printf("text:%s\n", text1); */
+    /* convert text1 to an ascii string to compare with the original */
+    char *converted = (char *)malloc(strlen(test1) + 1);
     int t = 0;
-    for(unsigned int i=0;i<strlen(text1);i+=3)
-    {
-        char tmp[3] = {'\0'};
+
+    for (unsigned int i = 0; i < strlen(text1); i += 3) {
+        char tmp[3] = { '\0' };
         tmp[0] = text1[i];
-        tmp[1] = text1[i+1];
-        char k =  (int) strtol(tmp, NULL, 16);
-        converted[i-t] = k;
-        t +=2;
+        tmp[1] = text1[i + 1];
+        char k = (int)strtol(tmp, NULL, 16);
+        converted[i - t] = k;
+        t += 2;
     }
+
     converted[strlen(test1)] = '\0';
-    //printf("%s\n", converted);
+    /*printf("%s\n", converted); */
     EXPECT_STREQ(test1, converted);
     free(converted);
 
-    const char * test2 = "qwertzuiopasdfghjklyxcvbnm1234567890";
+    const char *test2 = "qwertzuiopasdfghjklyxcvbnm1234567890";
     char text2[DLT_DAEMON_TEXTSIZE];
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text2,DLT_DAEMON_TEXTSIZE,(unsigned char *)test2, strlen(test2)));
-    //printf("text:%s\n", text2);
-    // convert text2 to an ascii string to compare with the original
-    converted = (char*) malloc(strlen(test2) +1);
+    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text2, DLT_DAEMON_TEXTSIZE, (unsigned char *)test2, strlen(test2)));
+    /*printf("text:%s\n", text2); */
+    /* convert text2 to an ascii string to compare with the original */
+    converted = (char *)malloc(strlen(test2) + 1);
     t = 0;
-    for(unsigned int i=0;i<strlen(text2);i+=3)
-    {
-        char tmp[3] = {'\0'};
+
+    for (unsigned int i = 0; i < strlen(text2); i += 3) {
+        char tmp[3] = { '\0' };
         tmp[0] = text2[i];
-        tmp[1] = text2[i+1];
-        char k =  (int) strtol(tmp, NULL, 16);
-        converted[i-t] = k;
-        t +=2;
+        tmp[1] = text2[i + 1];
+        char k = (int)strtol(tmp, NULL, 16);
+        converted[i - t] = k;
+        t += 2;
     }
+
     converted[strlen(test2)] = '\0';
-    //printf("%s\n", converted);
+    /*printf("%s\n", converted); */
     EXPECT_STREQ(test2, converted);
     free(converted);
 }
 TEST(t_dlt_print_hex_string, abnormal)
 {
-    // print special characters, expected 0
-//    const char * test3 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|";
-//    char text3[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text3,DLT_DAEMON_TEXTSIZE,(unsigned char *)test3, strlen(test3)));
-    //printf("text:%s\n", text3);
-    // convert text3 to an ascii string to compare with the original
-//    char * converted = (char*) malloc(strlen(test3) +1);
-//    int t = 0;
-//    for(unsigned int i=0;i<strlen(text3);i+=3)
-//    {
-//        char tmp[2];
-//        tmp[0] = text3[i];
-//        tmp[1] = text3[i+1];
-//        char k =  (int) strtol(tmp, NULL, 16);
-//        converted[i-t] = k;
-//        t +=2;
-//    }
-//    converted[strlen(test3)] = '\0';
-    //printf("%s\n", converted);
-//    EXPECT_STREQ(test3, converted);
-//  free(converted);
-
-    // Empty char *, expect 0
-//    const char * test4 = "";
-//    char text4[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text4,DLT_DAEMON_TEXTSIZE,(unsigned char *)test4, strlen(test4)));
-    //printf("text:%s\n", text4);
-    // convert text4 to an ascii string to compare with the original
-//    converted = (char*) malloc(strlen(test4) +1);
-//    t = 0;
-//    for(unsigned int i=0;i<strlen(text4);i+=3)
-//    {
-//        char tmp[2];
-//        tmp[0] = text4[i];
-//        tmp[1] = text4[i+1];
-//        char k =  (int) strtol(tmp, NULL, 16);
-//        converted[i-t] = k;
-//        t +=2;
-//    }
-//    converted[strlen(test4)] = '\0';
-    //printf("%s\n", converted);
-//    EXPECT_STREQ(test4, converted);
-//    free(converted);
+    /* print special characters, expected 0 */
+/*    const char * test3 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|"; */
+/*    char text3[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text3,DLT_DAEMON_TEXTSIZE,(unsigned char *)test3, strlen(test3))); */
+    /*printf("text:%s\n", text3); */
+    /* convert text3 to an ascii string to compare with the original */
+/*    char * converted = (char*) malloc(strlen(test3) +1); */
+/*    int t = 0; */
+/*    for(unsigned int i=0;i<strlen(text3);i+=3) */
+/*    { */
+/*        char tmp[2]; */
+/*        tmp[0] = text3[i]; */
+/*        tmp[1] = text3[i+1]; */
+/*        char k =  (int) strtol(tmp, NULL, 16); */
+/*        converted[i-t] = k; */
+/*        t +=2; */
+/*    } */
+/*    converted[strlen(test3)] = '\0'; */
+    /*printf("%s\n", converted); */
+/*    EXPECT_STREQ(test3, converted); */
+/*  free(converted); */
+
+    /* Empty char *, expect 0 */
+/*    const char * test4 = ""; */
+/*    char text4[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_hex_string(text4,DLT_DAEMON_TEXTSIZE,(unsigned char *)test4, strlen(test4))); */
+    /*printf("text:%s\n", text4); */
+    /* convert text4 to an ascii string to compare with the original */
+/*    converted = (char*) malloc(strlen(test4) +1); */
+/*    t = 0; */
+/*    for(unsigned int i=0;i<strlen(text4);i+=3) */
+/*    { */
+/*        char tmp[2]; */
+/*        tmp[0] = text4[i]; */
+/*        tmp[1] = text4[i+1]; */
+/*        char k =  (int) strtol(tmp, NULL, 16); */
+/*        converted[i-t] = k; */
+/*        t +=2; */
+/*    } */
+/*    converted[strlen(test4)] = '\0'; */
+    /*printf("%s\n", converted); */
+/*    EXPECT_STREQ(test4, converted); */
+/*    free(converted); */
 }
 TEST(t_dlt_print_hex_string, nullpointer)
 {
-    const char * test5 = "HELLO";
+    const char *test5 = "HELLO";
     char text5[DLT_DAEMON_TEXTSIZE];
 
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(NULL,0,NULL, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(NULL,0,(unsigned char *)test5, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(text5,0,NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(NULL, 0, (unsigned char *)test5, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_hex_string(text5, 0, NULL, 0));
 }
 /* End Method:dlt_common::dlt_print_hex_string */
 
@@ -3606,59 +3908,63 @@ TEST(t_dlt_print_hex_string, nullpointer)
 /* Begin Method:dlt_common::dlt_print_mixed_string */
 TEST(t_dlt_print_mixed_string, normal)
 {
-    const char * test1 = "HELLO_MIXED";
+    const char *test1 = "HELLO_MIXED";
     char text1[DLT_DAEMON_TEXTSIZE];
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text1,DLT_DAEMON_TEXTSIZE,(unsigned char *)test1,strlen(test1),0));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_print_mixed_string(text1, DLT_DAEMON_TEXTSIZE, (unsigned char *)test1, strlen(test1), 0));
     printf("%s\n", text1);
 
-    const char * test2 = "HELLO_MIXED";
+    const char *test2 = "HELLO_MIXED";
     char text2[DLT_DAEMON_TEXTSIZE];
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text2,DLT_DAEMON_TEXTSIZE,(unsigned char *)test2,strlen(test2),1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_print_mixed_string(text2, DLT_DAEMON_TEXTSIZE, (unsigned char *)test2, strlen(test2), 1));
     printf("%s\n", text2);
 
-    const char * test3 = "qwertzuiopasdfghjklyxcvbnm1234567890";
+    const char *test3 = "qwertzuiopasdfghjklyxcvbnm1234567890";
     char text3[DLT_DAEMON_TEXTSIZE];
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text3,DLT_DAEMON_TEXTSIZE,(unsigned char *)test3,strlen(test3),0));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_print_mixed_string(text3, DLT_DAEMON_TEXTSIZE, (unsigned char *)test3, strlen(test3), 0));
     printf("%s\n", text3);
 
-    const char * test4 = "qwertzuiopasdfghjklyxcvbnm1234567890";
+    const char *test4 = "qwertzuiopasdfghjklyxcvbnm1234567890";
     char text4[DLT_DAEMON_TEXTSIZE];
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text4,DLT_DAEMON_TEXTSIZE,(unsigned char *)test4,strlen(test4),1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_print_mixed_string(text4, DLT_DAEMON_TEXTSIZE, (unsigned char *)test4, strlen(test4), 1));
     printf("%s\n", text4);
 }
 TEST(t_dlt_print_mixed_string, abnormal)
 {
-//    const char * test5 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|";
-//    char text5[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text5,DLT_DAEMON_TEXTSIZE,(unsigned char *)test5,strlen(test5),0));
-//    printf("%s\n", text5);
+/*    const char * test5 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|"; */
+/*    char text5[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text5,DLT_DAEMON_TEXTSIZE,(unsigned char *)test5,strlen(test5),0)); */
+/*    printf("%s\n", text5); */
 
-//    const char * test6 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|";
-//    char text6[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text6,DLT_DAEMON_TEXTSIZE,(unsigned char *)test6,strlen(test6),1));
-//    printf("%s\n", text6);
+/*    const char * test6 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|"; */
+/*    char text6[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text6,DLT_DAEMON_TEXTSIZE,(unsigned char *)test6,strlen(test6),1)); */
+/*    printf("%s\n", text6); */
 
-//    const char * test7 = "";
-//    char text7[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text7,DLT_DAEMON_TEXTSIZE,(unsigned char *)test7,strlen(test7),0));
-//    printf("%s\n", text7);
+/*    const char * test7 = ""; */
+/*    char text7[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text7,DLT_DAEMON_TEXTSIZE,(unsigned char *)test7,strlen(test7),0)); */
+/*    printf("%s\n", text7); */
 
-//    const char * test8 = "";
-//    char text8[DLT_DAEMON_TEXTSIZE];
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text8,DLT_DAEMON_TEXTSIZE,(unsigned char *)test8,strlen(test8),1));
-//    printf("%s\n", text8);
+/*    const char * test8 = ""; */
+/*    char text8[DLT_DAEMON_TEXTSIZE]; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_mixed_string(text8,DLT_DAEMON_TEXTSIZE,(unsigned char *)test8,strlen(test8),1)); */
+/*    printf("%s\n", text8); */
 }
 TEST(t_dlt_print_mixed_string, nullpointer)
 {
-    const char * test9 = "";
+    const char *test9 = "";
     char text9[DLT_DAEMON_TEXTSIZE];
 
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL,0,0,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL,0,0,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL,0,(unsigned char *)test9,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL,0,(unsigned char *)test9,0,1));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(text9,0,NULL,0,0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(text9,0,NULL,0,1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL, 0, 0, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL, 0, 0, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL, 0, (unsigned char *)test9, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(NULL, 0, (unsigned char *)test9, 0, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(text9, 0, NULL, 0, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_mixed_string(text9, 0, NULL, 0, 1));
 }
 /* End Method:dlt_common::dlt_print_mixed_string */
 
@@ -3668,48 +3974,48 @@ TEST(t_dlt_print_mixed_string, nullpointer)
 /* Begin Method:dlt_common::dlt_print_char_string */
 TEST(t_dlt_print_char_string, normal)
 {
-    // Normal Use-Case, expect 0
-    const char * test1 = "HELLO";
+    /* Normal Use-Case, expect 0 */
+    const char *test1 = "HELLO";
     char text1[DLT_DAEMON_TEXTSIZE];
-    char * ptr1 = text1;
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr1,DLT_DAEMON_TEXTSIZE,(unsigned char *)test1, strlen(test1)));
+    char *ptr1 = text1;
+    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr1, DLT_DAEMON_TEXTSIZE, (unsigned char *)test1, strlen(test1)));
     printf("text:%s\n", text1);
     EXPECT_STREQ(text1, test1);
 
-    const char * test2 = "qwertzuiopasdfghjklyxcvbnm1234567890";
+    const char *test2 = "qwertzuiopasdfghjklyxcvbnm1234567890";
     char text2[DLT_DAEMON_TEXTSIZE];
-    char * ptr2 = text2;
-    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr2,DLT_DAEMON_TEXTSIZE,(unsigned char *)test2, strlen(test2)));
+    char *ptr2 = text2;
+    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr2, DLT_DAEMON_TEXTSIZE, (unsigned char *)test2, strlen(test2)));
     printf("text:%s\n", text2);
     EXPECT_STREQ(text2, test2);
 }
 TEST(t_dlt_print_char_string, abnormal)
 {
-    // print special characters, expected 0
-//    const char * test3 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|";
-//    char text3[DLT_DAEMON_TEXTSIZE];
-//    char * ptr3 = text3;
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr3,DLT_DAEMON_TEXTSIZE,(unsigned char *)test3, strlen(test3)));
-//    printf("text:%s\n", text3);
-//    EXPECT_STREQ(text3, test3);
-
-    // Empty char *, expect 0
-//    const char * test4 = "";
-//    char text4[DLT_DAEMON_TEXTSIZE];
-//    char * ptr4 = text4;
-//    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr4,DLT_DAEMON_TEXTSIZE,(unsigned char *)test4, strlen(test4)));
-//    printf("text:%s\n", text4);
-//    EXPECT_STREQ(text4, test4);
+    /* print special characters, expected 0 */
+/*    const char * test3 = "^°!\"§$%&/()=?`´¹²³¼½¬{[]}\\¸@€üöä+#*'~`,.-;:_·…–<>|"; */
+/*    char text3[DLT_DAEMON_TEXTSIZE]; */
+/*    char * ptr3 = text3; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr3,DLT_DAEMON_TEXTSIZE,(unsigned char *)test3, strlen(test3))); */
+/*    printf("text:%s\n", text3); */
+/*    EXPECT_STREQ(text3, test3); */
+
+    /* Empty char *, expect 0 */
+/*    const char * test4 = ""; */
+/*    char text4[DLT_DAEMON_TEXTSIZE]; */
+/*    char * ptr4 = text4; */
+/*    EXPECT_LE(DLT_RETURN_OK, dlt_print_char_string(&ptr4,DLT_DAEMON_TEXTSIZE,(unsigned char *)test4, strlen(test4))); */
+/*    printf("text:%s\n", text4); */
+/*    EXPECT_STREQ(text4, test4); */
 }
 TEST(t_dlt_print_char_string, nullpointer)
 {
-    const char * test5 = "HELLO";
+    const char *test5 = "HELLO";
     char text5[DLT_DAEMON_TEXTSIZE];
-    char * ptr5 = text5;
+    char *ptr5 = text5;
 
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(NULL,0,NULL, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(NULL,0,(unsigned char *)test5, 0));
-    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(&ptr5,0,NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(NULL, 0, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(NULL, 0, (unsigned char *)test5, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_print_char_string(&ptr5, 0, NULL, 0));
 }
 /* End Method:dlt_common::dlt_print_char_string */
 
@@ -3719,32 +4025,32 @@ TEST(t_dlt_print_char_string, nullpointer)
 /* Begin Method:dlt_common::dlt_print_id */
 TEST(t_dlt_print_id, normal)
 {
-    // Normal Use-Case, expect text==id
-    const char* id = "DLTD";
+    /* Normal Use-Case, expect text==id */
+    const char *id = "DLTD";
     char text[DLT_DAEMON_TEXTSIZE];
-    dlt_print_id(text,id);
-    EXPECT_STREQ(text,id);
+    dlt_print_id(text, id);
+    EXPECT_STREQ(text, id);
 }
 TEST(t_dlt_print_id, abnormal)
 {
-    // id to long, expect only first 4 chars
-//    const char* id = "DLTD123456789";
-//    char text[DLT_DAEMON_TEXTSIZE];
-//    dlt_print_id(text,id);
-//    EXPECT_STREQ(text,"DLTD");
+    /* id to long, expect only first 4 chars */
+/*    const char* id = "DLTD123456789"; */
+/*    char text[DLT_DAEMON_TEXTSIZE]; */
+/*    dlt_print_id(text,id); */
+/*    EXPECT_STREQ(text,"DLTD"); */
 
-    // id to short, expect expend with "-" to 4 chars
-//    id = "DL";
-//    dlt_print_id(text,id);
-//    EXPECT_STREQ(text,"DL--");
+    /* id to short, expect expend with "-" to 4 chars */
+/*    id = "DL"; */
+/*    dlt_print_id(text,id); */
+/*    EXPECT_STREQ(text,"DL--"); */
 }
 TEST(t_dlt_print_id, nullpointer)
 {
-    const char* id = "DLTD";
+    const char *id = "DLTD";
     char text[DLT_DAEMON_TEXTSIZE];
 
-    // NULL-Pointer, expected nothing in return
-    EXPECT_NO_THROW(dlt_print_id(NULL,NULL));
+    /* NULL-Pointer, expected nothing in return */
+    EXPECT_NO_THROW(dlt_print_id(NULL, NULL));
     EXPECT_NO_THROW(dlt_print_id(NULL, id));
     EXPECT_NO_THROW(dlt_print_id(text, NULL));
 }
@@ -3756,21 +4062,21 @@ TEST(t_dlt_print_id, nullpointer)
 /* Begin Method:dlt_common::dlt_get_version */
 TEST(t_dlt_get_version, normal)
 {
-    // Normal Use-Case
+    /* Normal Use-Case */
     char ver[255];
     dlt_get_version(ver, 255);
     printf("%s\n", ver);
 }
 TEST(t_dlt_get_version, abnormal)
 {
-    // Change default length of ver to 1
-//    char ver[1];
-//    dlt_get_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH);
-//    printf("%s\n", ver);
+    /* Change default length of ver to 1 */
+/*    char ver[1]; */
+/*    dlt_get_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH); */
+/*    printf("%s\n", ver); */
 
-    // Change default length of ver to 1 and reduce second para to 1, too
-//    dlt_get_version(ver, 1);
-//    printf("%s\n", ver);
+    /* Change default length of ver to 1 and reduce second para to 1, too */
+/*    dlt_get_version(ver, 1); */
+/*    printf("%s\n", ver); */
 }
 TEST(t_dlt_get_version, nullpointer)
 {
@@ -3790,18 +4096,18 @@ TEST(dlt_get_major_version, normal)
 }
 TEST(dlt_get_major_version, abnormal)
 {
-    // Change default length of ver to 1
-//    char ver[1];
-//    dlt_get_major_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH);
-//    EXPECT_STREQ(ver, _DLT_PACKAGE_MAJOR_VERSION);
+    /* Change default length of ver to 1 */
+/*    char ver[1]; */
+/*    dlt_get_major_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH); */
+/*    EXPECT_STREQ(ver, _DLT_PACKAGE_MAJOR_VERSION); */
 
-    // Change default length of ver to 1 and reduce second para to 1, too
-//    dlt_get_major_version(ver, 1);
-//    EXPECT_STREQ(ver, _DLT_PACKAGE_MAJOR_VERSION);
+    /* Change default length of ver to 1 and reduce second para to 1, too */
+/*    dlt_get_major_version(ver, 1); */
+/*    EXPECT_STREQ(ver, _DLT_PACKAGE_MAJOR_VERSION); */
 }
 TEST(dlt_get_major_version, nullpointer)
 {
-    // NULL-Pointer, expect exeption
+    /* NULL-Pointer, expect exeption */
     EXPECT_NO_THROW(dlt_get_major_version(NULL, 0));
 }
 /* End Method:dlt_common::dlt_get_major_version */
@@ -3818,18 +4124,18 @@ TEST(dlt_get_minor_version, normal)
 }
 TEST(dlt_get_minor_version, abnormal)
 {
-    // Change default length of ver to 1
-//    char ver[1];
-//    dlt_get_minor_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH);
-//    EXPECT_STREQ(ver, _DLT_PACKAGE_MINOR_VERSION);
+    /* Change default length of ver to 1 */
+/*    char ver[1]; */
+/*    dlt_get_minor_version(ver, DLT_USER_MAX_LIB_VERSION_LENGTH); */
+/*    EXPECT_STREQ(ver, _DLT_PACKAGE_MINOR_VERSION); */
 
-    // Change default length of ver to 1 and reduce second para to 1, too
-//    dlt_get_minor_version(ver, 1);
-//    EXPECT_STREQ(ver, _DLT_PACKAGE_MINOR_VERSION);
+    /* Change default length of ver to 1 and reduce second para to 1, too */
+/*    dlt_get_minor_version(ver, 1); */
+/*    EXPECT_STREQ(ver, _DLT_PACKAGE_MINOR_VERSION); */
 }
 TEST(dlt_get_minor_version, nullpointer)
 {
-    // NULL-Pointer, expect exeption
+    /* NULL-Pointer, expect exeption */
     EXPECT_NO_THROW(dlt_get_minor_version(NULL, 0));
 }
 /* End Method:dlt_common::dlt_get_minor_version */
@@ -3848,6 +4154,6 @@ int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
     ::testing::FLAGS_gtest_break_on_failure = true;
-    //::testing::FLAGS_gtest_filter = "*.normal";
+    /*::testing::FLAGS_gtest_filter = "*.normal"; */
     return RUN_ALL_TESTS();
 }
diff --git a/tests/gtest_dlt_daemon_common.cpp b/tests/gtest_dlt_daemon_common.cpp
index 5e22c2d..12f4dde 100644
--- a/tests/gtest_dlt_daemon_common.cpp
+++ b/tests/gtest_dlt_daemon_common.cpp
@@ -23,7 +23,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file gtest_dlt_common.cpp
-*/
+ */
 
 #include <stdio.h>
 #include <gtest/gtest.h>
@@ -46,12 +46,12 @@ extern "C" {
 }
 
 #ifndef DLT_USER_DIR
-#define DLT_USER_DIR  "/tmp/dltpipes"
+#   define DLT_USER_DIR  "/tmp/dltpipes"
 #endif
 
 /* Name of named pipe to DLT daemon */
 #ifndef DLT_USER_FIFO
-#define DLT_USER_FIFO "/tmp/dlt"
+#   define DLT_USER_FIFO "/tmp/dlt"
 #endif
 
 /* Begin Method:dlt_daemon_common::dlt_daemon_init_user_information */
@@ -66,7 +66,7 @@ TEST(t_dlt_daemon_init_user_information, normal_one_list)
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
@@ -84,18 +84,18 @@ TEST(t_dlt_daemon_init_user_information, normal_multiple_lists)
     char ecu3[] = "ECU3";
 
     gateway.connections =
-            (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection));
+        (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection));
     gateway.connections[0].ecuid = &ecu2[0];
     gateway.connections[1].ecuid = &ecu3[0];
     gateway.num_connections = 2;
 
-    // Normal Use-Case
+    /* Normal Use-Case */
     EXPECT_EQ(0, dlt_daemon_init(&daemon,
                                  DLT_DAEMON_RINGBUFFER_MIN_SIZE,
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
 
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 1, 0));
@@ -132,7 +132,7 @@ TEST(t_dlt_daemon_find_users_list, normal_one_list)
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
 
@@ -157,7 +157,7 @@ TEST(t_dlt_daemon_find_users_list, abnormal)
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
 
@@ -178,18 +178,18 @@ TEST(t_dlt_daemon_find_users_list, normal_multiple_lists)
     DltDaemonRegisteredUsers *user_list;
 
     gateway.connections =
-            (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection));
+        (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection));
     gateway.connections[0].ecuid = &ecu2[0];
     gateway.connections[1].ecuid = &ecu3[0];
     gateway.num_connections = 2;
 
-    // Normal Use-Case
+    /* Normal Use-Case */
     EXPECT_EQ(0, dlt_daemon_init(&daemon,
                                  DLT_DAEMON_RINGBUFFER_MIN_SIZE,
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
 
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 1, 0));
@@ -229,31 +229,34 @@ TEST(t_dlt_daemon_application_add, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
     pid_t pid = 0;
-    const char * desc = "HELLO_TEST";
+    const char *desc = "HELLO_TEST";
     DltDaemonApplication *app = NULL;
     char ecu[] = "ECU1";
     int fd = 15;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
 
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
-    //printf("### APP: APID=%s  DESCR=%s NUMCONTEXT=%i PID=%i USERHANDLE=%i\n", app->apid,app->application_description, app->num_contexts, app->pid, app->user_handle);
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
+    /*printf("### APP: APID=%s  DESCR=%s NUMCONTEXT=%i PID=%i USERHANDLE=%i\n", app->apid,app->application_description, app->num_contexts, app->pid, app->user_handle); */
     EXPECT_STREQ(apid, app->apid);
     EXPECT_STREQ(desc, app->application_description);
     EXPECT_EQ(pid, app->pid);
-    EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, ecu, 0));
+    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // Apid > 4, expected truncate to 4 char or error
+    /* Apid > 4, expected truncate to 4 char or error */
     apid = "TO_LONG";
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
-    char  tmp[5];
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
+    char tmp[5];
     strncpy(tmp, apid, 4);
     tmp[4] = '\0';
     EXPECT_STREQ(tmp, app->apid);
@@ -263,65 +266,65 @@ TEST(t_dlt_daemon_application_add, normal)
 }
 TEST(t_dlt_daemon_application_add, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
-
-    // Add the same application with same pid twice
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_LE((DltDaemonApplication *) 0, app);
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_EQ((DltDaemonApplication *) 0, app);
-//    dlt_daemon_application_del(&daemon,app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Add the same applicaiotn with different pid
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, 0, (char *) desc, 0);
-//    EXPECT_LE((DltDaemonApplication *) 0, app);
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, 123, (char *) desc, 0);
-//    EXPECT_EQ((DltDaemonApplication *) 0, app);
-//    dlt_daemon_application_del(&daemon,app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-
-    // verbose value != 0 or 1
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 12345678));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Apid < 4, expected fill to 4 chars or error
-//    apid = "SH";
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    char tmp[5];
-//    strncpy(tmp, apid, 4);
-//    tmp[4] = '\0';
-//    EXPECT_STREQ(tmp, app->apid);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* Add the same application with same pid twice */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_LE((DltDaemonApplication *) 0, app); */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_EQ((DltDaemonApplication *) 0, app); */
+/*    dlt_daemon_application_del(&daemon,app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Add the same applicaiotn with different pid */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, 0, (char *) desc, 0); */
+/*    EXPECT_LE((DltDaemonApplication *) 0, app); */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, 123, (char *) desc, 0); */
+/*    EXPECT_EQ((DltDaemonApplication *) 0, app); */
+/*    dlt_daemon_application_del(&daemon,app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+
+    /* verbose value != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 12345678)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Apid < 4, expected fill to 4 chars or error */
+/*    apid = "SH"; */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    char tmp[5]; */
+/*    strncpy(tmp, apid, 4); */
+/*    tmp[4] = '\0'; */
+/*    EXPECT_STREQ(tmp, app->apid); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 
 }
 TEST(t_dlt_daemon_application_add, nullpointer)
 {
     DltDaemon daemon;
-    const char * apid = "TEST";
-    const char * desc = "HELLO_TEST";
+    const char *apid = "TEST";
+    const char *desc = "HELLO_TEST";
     int fd = 42;
     char ecu[] = "ECU1";
 
-    // NULL-Pointer test
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, (char *) desc, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, NULL, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, (char *) desc, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, NULL, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, (char *) desc, 0, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, fd, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, 0, ecu, 0));
+    /* NULL-Pointer test */
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, NULL, 0, NULL, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, NULL, 0, (char *)desc, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, (char *)apid, 0, NULL, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, (char *)apid, 0, (char *)desc, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon, NULL, 0, NULL, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon, NULL, 0, (char *)desc, 0, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, NULL, 0, NULL, fd, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL, NULL, 0, NULL, 0, ecu, 0));
 }
 /* End Method:dlt_daemon_common::dlt_daemon_application_add */
 
@@ -333,48 +336,51 @@ TEST(t_dlt_daemon_application_del, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
     pid_t pid = 0;
-    const char * desc = "HELLO_TEST";
+    const char *desc = "HELLO_TEST";
     DltDaemonApplication *app = NULL;
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case, retrun type cannot be tested, only apid and desc
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case, retrun type cannot be tested, only apid and desc */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
-    EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, ecu, 0));
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
+    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 
 TEST(t_dlt_daemon_application_del, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
 
-    // no application exists, expect < 0
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, 0));
+    /* no application exists, expect < 0 */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, 0)); */
 
-    // Call delete two times
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, 0));
-//    EXPECT_GE(-1, dlt_daemon_application_del(&daemon,app, 0));
-//    dlt_daemon_applications_clear(&daemon, 0);
+    /* Call delete two times */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, 0)); */
+/*    EXPECT_GE(-1, dlt_daemon_application_del(&daemon,app, 0)); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
 
 
-    // Verbose parameter != 0 or 1
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_application_del(&daemon,app, 123456789));
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+    /* Verbose parameter != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_application_del(&daemon,app, 123456789)); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 
 }
 TEST(t_dlt_daemon_application_del, nullpointer)
@@ -383,10 +389,10 @@ TEST(t_dlt_daemon_application_del, nullpointer)
     DltDaemonApplication app;
     char ecu[] = "ECU1";
 
-    // NULL-Pointer
-    EXPECT_GE(-1, dlt_daemon_application_del(NULL,NULL, NULL, 0));
+    /* NULL-Pointer */
+    EXPECT_GE(-1, dlt_daemon_application_del(NULL, NULL, NULL, 0));
     EXPECT_GE(-1, dlt_daemon_application_del(NULL, &app, NULL, 0));
-    EXPECT_GE(-1, dlt_daemon_application_del(&daemon,NULL, ecu, 0));
+    EXPECT_GE(-1, dlt_daemon_application_del(&daemon, NULL, ecu, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_application_del */
 
@@ -398,63 +404,66 @@ TEST(t_dlt_daemon_application_find, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
     pid_t pid = 0;
-    const char * desc = "HELLO_TEST";
+    const char *desc = "HELLO_TEST";
     DltDaemonApplication *app = NULL;
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
     EXPECT_STREQ(apid, app->apid);
     EXPECT_STREQ(desc, app->application_description);
     EXPECT_EQ(pid, app->pid);
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // Application doesn't exist, expect NULL
-    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) apid, 0));
+    /* Application doesn't exist, expect NULL */
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_find(&daemon, ecu, (char *)apid, 0));
 
-    // Use a different apid, expect NULL
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
-    EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) apid, 0));
-    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) "NEXI", 0));
+    /* Use a different apid, expect NULL */
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
+    EXPECT_LE((DltDaemonApplication *)0, dlt_daemon_application_find(&daemon, ecu, (char *)apid, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_find(&daemon, ecu, (char *)"NEXI", 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_application_find, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
-
-    // Verbose != 0 or 1, expect error
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    dlt_daemon_application_find(&daemon, (char *) apid, 0);
-//    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, (char *) apid, 123456789));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* Verbose != 0 or 1, expect error */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    dlt_daemon_application_find(&daemon, (char *) apid, 0); */
+/*    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, (char *) apid, 123456789)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 
 }
 TEST(t_dlt_daemon_application_find, nullpointer)
 {
     DltDaemon daemon;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
 
-    // NULL-Pointer, expected NULL
-    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, NULL, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, (char *) apid, NULL, 0));
-    EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, NULL, NULL, 0));
+    /* NULL-Pointer, expected NULL */
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_find(NULL, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_find(NULL, (char *)apid, NULL, 0));
+    EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_find(&daemon, NULL, NULL, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_applikation_find */
 
@@ -470,34 +479,38 @@ TEST(t_dlt_daemon_applications_clear, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use Case, expect >= 0
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use Case, expect >= 0 */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_add(&daemon, (char *) "TES1", pid, (char *) "Test clear 1", fd, ecu, 0));
-    dlt_daemon_application_add(&daemon, (char *) "TES2", pid, (char *) "Test clear 2", fd, ecu, 0);
+    EXPECT_LE((DltDaemonApplication *)0,
+              dlt_daemon_application_add(&daemon, (char *)"TES1", pid, (char *)"Test clear 1", fd, ecu, 0));
+    dlt_daemon_application_add(&daemon, (char *)"TES2", pid, (char *)"Test clear 2", fd, ecu, 0);
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_applications_clear, abnormal)
 {
-//    DltDaemon daemon;
-//    pid_t pid = 0;
-
-    // No applications added, expect < -1
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_applications_clear(&daemon, 0));
-
-    // Verbose != 0 or 1, expect error
-//    dlt_daemon_application_add(&daemon, (char *) "TEST", pid, (char *) "Test clear", 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_clear(&daemon, 123456789));
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    pid_t pid = 0; */
+
+    /* No applications added, expect < -1 */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_clear(&daemon, 0)); */
+
+    /* Verbose != 0 or 1, expect error */
+/*    dlt_daemon_application_add(&daemon, (char *) "TEST", pid, (char *) "Test clear", 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_clear(&daemon, 123456789)); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_applications_clear, nullpointer)
 {
-    // NULL-Pointer, expect < 0
+    /* NULL-Pointer, expect < 0 */
     EXPECT_GE(-1, dlt_daemon_applications_clear(NULL, NULL, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_applications_clear */
@@ -509,19 +522,22 @@ TEST(t_dlt_daemon_applications_invalidate_fd, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
     pid_t pid = 0;
-    const char * desc = "HELLO_TEST";
+    const char *desc = "HELLO_TEST";
     DltDaemonApplication *app = NULL;
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
     EXPECT_LE(0, dlt_daemon_applications_invalidate_fd(&daemon, ecu, app->user_handle, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
@@ -529,26 +545,26 @@ TEST(t_dlt_daemon_applications_invalidate_fd, normal)
 }
 TEST(t_dlt_daemon_applications_invalidate_fd, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
-
-    // Daemon isn't initialized, expected error
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(&daemon, 0, 0));
-
-    // Verbose != 0 or 1, expect error
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(&daemon, app->user_handle, 123456789));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* Daemon isn't initialized, expected error */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(&daemon, 0, 0)); */
+
+    /* Verbose != 0 or 1, expect error */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(&daemon, app->user_handle, 123456789)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_applications_invalidate_fd, nullpointer)
 {
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(NULL, NULL, 0, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_applications_invalidate_fd */
@@ -561,59 +577,62 @@ TEST(t_dlt_daemon_applications_save, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-    const char * apid = "TEST";
+    const char *apid = "TEST";
     pid_t pid = 0;
-    const char * desc = "HELLO_TEST";
+    const char *desc = "HELLO_TEST";
     DltDaemonApplication *app = NULL;
-    const char * filename = "/tmp/dlt-runtime.cfg";
+    const char *filename = "/tmp/dlt-runtime.cfg";
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0);
-    EXPECT_LE(0, dlt_daemon_applications_save(&daemon, (char *) filename, 0));
+    app = dlt_daemon_application_add(&daemon, (char *)apid, pid, (char *)desc, fd, ecu, 0);
+    EXPECT_LE(0, dlt_daemon_applications_save(&daemon, (char *)filename, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_applications_save, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
-//    const char * filename = "/tmp/dlt-runtime.cfg";
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) filename, 0));
-
-    // Verbose != 1 or 0, expect error
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) filename, 123456789));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Wrong path filename
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) "PATH_DONT_EXIST", 0));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
+/*    const char * filename = "/tmp/dlt-runtime.cfg"; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) filename, 0)); */
+
+    /* Verbose != 1 or 0, expect error */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) filename, 123456789)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Wrong path filename */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, (char *) "PATH_DONT_EXIST", 0)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_applications_save, nullpointer)
 {
     DltDaemon daemon;
-    const char * filename = "/tmp/dlt-runtime.cfg";
+    const char *filename = "/tmp/dlt-runtime.cfg";
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_applications_save(NULL, NULL, 0));
-    EXPECT_GE(-1, dlt_daemon_applications_save(NULL, (char *) filename, 0));
+    EXPECT_GE(-1, dlt_daemon_applications_save(NULL, (char *)filename, 0));
     EXPECT_GE(-1, dlt_daemon_applications_save(&daemon, NULL, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_applications_save */
@@ -627,50 +646,53 @@ TEST(t_dlt_daemon_applications_load, normal)
     DltDaemon daemon;
     DltGateway gateway;
     char ecu[] = "ECU1";
-    const char * filename = "/tmp/dlt-runtime.cfg";
+    const char *filename = "/tmp/dlt-runtime.cfg";
 
-    // Normal Use-Case, first execute t_dlt_daemon_applications_save !!
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case, first execute t_dlt_daemon_applications_save !! */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    EXPECT_LE(0, dlt_daemon_applications_load(&daemon,(char *) filename, 0));
+    EXPECT_LE(0, dlt_daemon_applications_load(&daemon, (char *)filename, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_applications_load, abnormal)
 {
-//    DltDaemon daemon;
-//    const char * apid = "TEST";
-//    pid_t pid = 0;
-//    const char * desc = "HELLO_TEST";
-//    DltDaemonApplication *app = NULL;
-//    const char * filename = "/tmp/dlt-runtime.cfg";
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) filename, 0));
-
-    // Verbose != 1 or 0, expect error
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) filename, 123456789));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Wrong path filename
-//    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) "PATH_DONT_EXIST", 0));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    const char * apid = "TEST"; */
+/*    pid_t pid = 0; */
+/*    const char * desc = "HELLO_TEST"; */
+/*    DltDaemonApplication *app = NULL; */
+/*    const char * filename = "/tmp/dlt-runtime.cfg"; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) filename, 0)); */
+
+    /* Verbose != 1 or 0, expect error */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) filename, 123456789)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Wrong path filename */
+/*    app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, (char *) "PATH_DONT_EXIST", 0)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_applications_load, nullpointer)
 {
     DltDaemon daemon;
-    const char * filename = "/tmp/dlt-runtime.cfg";
+    const char *filename = "/tmp/dlt-runtime.cfg";
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_applications_load(NULL, NULL, 0));
-    EXPECT_GE(-1, dlt_daemon_applications_load(NULL, (char *) filename, 0));
+    EXPECT_GE(-1, dlt_daemon_applications_load(NULL, (char *)filename, 0));
     EXPECT_GE(-1, dlt_daemon_applications_load(&daemon, NULL, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_applications_load */
@@ -688,20 +710,20 @@ TEST(t_dlt_daemon_applications_load, nullpointer)
 /* Begin Method: dlt_daemon_common::dlt_daemon_context_add */
 TEST(t_dlt_daemon_context_add, normal)
 {
-//  Log Level
-//  DLT_LOG_DEFAULT =             -1,   /**< Default log level */
-//  DLT_LOG_OFF     =           0x00,   /**< Log level off */
-//  DLT_LOG_FATAL   =           0x01,   /**< fatal system error */
-//  DLT_LOG_ERROR   =           0x02,   /**< error with impact to correct functionality */
-//  DLT_LOG_WARN    =           0x03,   /**< warning, correct behaviour could not be ensured */
-//  DLT_LOG_INFO    =           0x04,   /**< informational */
-//  DLT_LOG_DEBUG   =           0x05,   /**< debug  */
-//  DLT_LOG_VERBOSE =           0x06    /**< highest grade of information */
-
-//  Trace Status
-//  DLT_TRACE_STATUS_DEFAULT =   -1,    /**< Default trace status */
-//  DLT_TRACE_STATUS_OFF     = 0x00,    /**< Trace status: Off */
-//  DLT_TRACE_STATUS_ON      = 0x01     /**< Trace status: On */
+/*  Log Level */
+/*  DLT_LOG_DEFAULT =             -1,   / **< Default log level * / */
+/*  DLT_LOG_OFF     =           0x00,   / **< Log level off * / */
+/*  DLT_LOG_FATAL   =           0x01,   / **< fatal system error * / */
+/*  DLT_LOG_ERROR   =           0x02,   / **< error with impact to correct functionality * / */
+/*  DLT_LOG_WARN    =           0x03,   / **< warning, correct behaviour could not be ensured * / */
+/*  DLT_LOG_INFO    =           0x04,   / **< informational * / */
+/*  DLT_LOG_DEBUG   =           0x05,   / **< debug  * / */
+/*  DLT_LOG_VERBOSE =           0x06    / **< highest grade of information * / */
+
+/*  Trace Status */
+/*  DLT_TRACE_STATUS_DEFAULT =   -1,    / **< Default trace status * / */
+/*  DLT_TRACE_STATUS_OFF     = 0x00,    / **< Trace status: Off * / */
+/*  DLT_TRACE_STATUS_ON      = 0x01     / **< Trace status: On * / */
 
     DltDaemon daemon;
     DltGateway gateway;
@@ -713,15 +735,18 @@ TEST(t_dlt_daemon_context_add, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
     daecontext = dlt_daemon_context_add(&daemon, apid, ctid, DLT_LOG_DEFAULT,
                                         DLT_TRACE_STATUS_DEFAULT, 0, 0, desc, ecu, 0);
-    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
+    /*printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
     EXPECT_STREQ(apid, daecontext->apid);
     EXPECT_STREQ(ctid, daecontext->ctid);
     EXPECT_STREQ(desc, daecontext->context_description);
@@ -730,7 +755,7 @@ TEST(t_dlt_daemon_context_add, normal)
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
-    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu,0));
+    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_context_add, abnormal)
@@ -745,102 +770,123 @@ TEST(t_dlt_daemon_context_add, abnormal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Log Level dont exists
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Log Level dont exists */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     DltLogLevelType DLT_LOG_NOT_EXIST = (DltLogLevelType) - 100;
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_NOT_EXIST,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
-    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-    EXPECT_EQ((DltDaemonContext *) 0, daecontext);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_NOT_EXIST,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
+    /*printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+    EXPECT_EQ((DltDaemonContext *)0, daecontext);
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // Trace Status dont exists
+    /* Trace Status dont exists */
     DltTraceStatusType DLT_TRACE_TYPE_NOT_EXIST = (DltTraceStatusType) - 100;
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_TYPE_NOT_EXIST,0,0,desc,ecu,0);
-    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-    EXPECT_EQ((DltDaemonContext *) 0, daecontext);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_TYPE_NOT_EXIST,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
+    /*printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+    EXPECT_EQ((DltDaemonContext *)0, daecontext);
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // Apid to long
-//    char apid_tl[8] = "TO_LONG";
-//    app = dlt_daemon_application_add(&daemon, apid_tl, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid_tl,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-//    EXPECT_STREQ(apid_tl, daecontext->apid);
-//    EXPECT_STREQ(ctid, daecontext->ctid);
-//    EXPECT_STREQ(desc, daecontext->context_description);
-//    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level);
-//    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status);
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Apid to short
-//    char apid_ts[3] = "TS";
-//    app = dlt_daemon_application_add(&daemon, apid_ts, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid_ts,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-//    EXPECT_STREQ(apid_ts, daecontext->apid);
-//    EXPECT_STREQ(ctid, daecontext->ctid);
-//    EXPECT_STREQ(desc, daecontext->context_description);
-//    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level);
-//    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status);
-//    //EXPECT_EQ(4, strlen(apid_ts));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Ctid to long
-//    char ctid_tl[8] = "TO_LONG";
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid_tl,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-//    EXPECT_STREQ(apid, daecontext->apid);
-//    EXPECT_STREQ(ctid_tl, daecontext->ctid);
-//    EXPECT_STREQ(desc, daecontext->context_description);
-//    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level);
-//    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status);
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Ctid to short
-//    char ctid_ts[4] = "TS";
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid_ts,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-//    EXPECT_STREQ(apid, daecontext->apid);
-//    EXPECT_STREQ(ctid_ts, daecontext->ctid);
-//    EXPECT_STREQ(desc, daecontext->context_description);
-//    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level);
-//    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status);
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,123456789);
-//    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid);
-//    EXPECT_EQ((DltDaemonContext *) 0, daecontext);
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
+    /* Apid to long */
+/*    char apid_tl[8] = "TO_LONG"; */
+/*    app = dlt_daemon_application_add(&daemon, apid_tl, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid_tl,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+/*    EXPECT_STREQ(apid_tl, daecontext->apid); */
+/*    EXPECT_STREQ(ctid, daecontext->ctid); */
+/*    EXPECT_STREQ(desc, daecontext->context_description); */
+/*    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); */
+/*    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Apid to short */
+/*    char apid_ts[3] = "TS"; */
+/*    app = dlt_daemon_application_add(&daemon, apid_ts, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid_ts,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+/*    EXPECT_STREQ(apid_ts, daecontext->apid); */
+/*    EXPECT_STREQ(ctid, daecontext->ctid); */
+/*    EXPECT_STREQ(desc, daecontext->context_description); */
+/*    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); */
+/*    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); */
+/*    //EXPECT_EQ(4, strlen(apid_ts)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Ctid to long */
+/*    char ctid_tl[8] = "TO_LONG"; */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid_tl,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+/*    EXPECT_STREQ(apid, daecontext->apid); */
+/*    EXPECT_STREQ(ctid_tl, daecontext->ctid); */
+/*    EXPECT_STREQ(desc, daecontext->context_description); */
+/*    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); */
+/*    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Ctid to short */
+/*    char ctid_ts[4] = "TS"; */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid_ts,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+/*    EXPECT_STREQ(apid, daecontext->apid); */
+/*    EXPECT_STREQ(ctid_ts, daecontext->ctid); */
+/*    EXPECT_STREQ(desc, daecontext->context_description); */
+/*    EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); */
+/*    EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,123456789); */
+/*    //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); */
+/*    EXPECT_EQ((DltDaemonContext *) 0, daecontext); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_context_add, nullpointer)
@@ -852,26 +898,29 @@ TEST(t_dlt_daemon_context_add, nullpointer)
     char ecu[] = "ECU1";
     char desc[255] = "TEST dlt_daemon_context_add";
 
-    // NULL-Pointer
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* NULL-Pointer */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,NULL,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,desc,NULL,0));
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,ctid,0,0,0,0,NULL,NULL,0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, NULL, NULL, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, NULL, ctid, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, NULL, ctid, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, apid, NULL, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, apid, NULL, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, apid, ctid, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(NULL, apid, ctid, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, NULL, NULL, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, NULL, NULL, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, NULL, ctid, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, NULL, ctid, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, apid, NULL, 0, 0, 0, 0, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, apid, NULL, 0, 0, 0, 0, desc, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_add(&daemon, apid, ctid, 0, 0, 0, 0, NULL, NULL, 0));
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_context_add */
@@ -891,13 +940,25 @@ TEST(t_dlt_daemon_context_del, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
@@ -906,39 +967,39 @@ TEST(t_dlt_daemon_context_del, normal)
 }
 TEST(t_dlt_daemon_context_del, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext;
-//    DltDaemonApplication *app;
-
-    // Context uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0));
-
-    // No application used
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0));
-//    EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0));
-//    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0));
-
-    // No contex added
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0));
-//    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0));
-//    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0));
-
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 123456789));
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext; */
+/*    DltDaemonApplication *app; */
+
+    /* Context uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+
+    /* No application used */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+/*    EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); */
+
+    /* No contex added */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); */
+
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 123456789)); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_context_del, nullpointer)
 {
@@ -946,7 +1007,7 @@ TEST(t_dlt_daemon_context_del, nullpointer)
     DltDaemonContext daecontext;
     char ecu[] = "ECU1";
 
-    //NULL-Pointer
+    /*NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_context_del(NULL, NULL, ecu, 0));
     EXPECT_GE(-1, dlt_daemon_context_del(NULL, &daecontext, NULL, 0));
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, NULL, NULL, 0));
@@ -969,13 +1030,25 @@ TEST(t_dlt_daemon_context_find, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_STREQ(apid, daecontext->apid);
     EXPECT_STREQ(ctid, daecontext->ctid);
     EXPECT_STREQ(desc, daecontext->context_description);
@@ -999,48 +1072,78 @@ TEST(t_dlt_daemon_context_find, abnormal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Uninitialized
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Uninitialized */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, ctid, ecu, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, apid, ctid, ecu, 0));
 
-    // No apid
+    /* No apid */
     char no_apid[1] = "";
     app = dlt_daemon_application_add(&daemon, no_apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
-    EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0));
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        no_apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0));
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // No ctid
+    /* No ctid */
     char no_ctid[1] = "";
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,no_ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, no_ctid, ecu, 0));
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        no_ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, apid, no_ctid, ecu, 0));
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // No application added
-    daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0));
+    /* No application added */
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        no_apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0));
     EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
     EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0));
 
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, ctid, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, ctid, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_context_find, nullpointer)
@@ -1050,14 +1153,14 @@ TEST(t_dlt_daemon_context_find, nullpointer)
     ID4 ctid = "CON";
     ID4 ecu = "ECU";
 
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, NULL, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, ctid, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, NULL, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, ctid, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, NULL, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, ctid, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, NULL, NULL, 0));
-    EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, NULL, ecu, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(NULL, NULL, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(NULL, NULL, ctid, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(NULL, apid, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(NULL, apid, ctid, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, NULL, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, NULL, ctid, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, apid, NULL, NULL, 0));
+    EXPECT_EQ((DltDaemonContext *)0, dlt_daemon_context_find(&daemon, NULL, NULL, ecu, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_context_find */
 
@@ -1077,13 +1180,25 @@ TEST(t_dlt_daemon_contexts_clear, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
     EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0));
@@ -1092,29 +1207,29 @@ TEST(t_dlt_daemon_contexts_clear, normal)
 }
 TEST(t_dlt_daemon_contexts_clear, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-
-    // No context added
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_contexts_clear(&daemon, 0));
-
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 123456789));
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* No context added */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_clear(&daemon, 0)); */
+
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 123456789)); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_contexts_clear, nullpointer)
 {
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_contexts_clear(NULL, NULL, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_contexts_clear */
@@ -1135,13 +1250,25 @@ TEST(t_dlt_daemon_contexts_invalidate_fd, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_contexts_invalidate_fd(&daemon, ecu, app->user_handle, 0));
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
@@ -1151,30 +1278,30 @@ TEST(t_dlt_daemon_contexts_invalidate_fd, normal)
 }
 TEST(t_dlt_daemon_contexts_invalidate_fd, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(&daemon, app->user_handle, 0));
-
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(&daemon, app->user_handle, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(&daemon, app->user_handle, 0)); */
+
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(&daemon, app->user_handle, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_contexts_invalidate_fd, nullpointer)
 {
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(NULL, NULL, 0, 0));
 }
 /* End Method: dlt_daemon_common::dlt_daemon_contexts_invalidate_fd */
@@ -1192,17 +1319,29 @@ TEST(t_dlt_daemon_contexts_save, normal)
     char desc[255] = "TEST dlt_daemon_context_add";
     DltDaemonContext *daecontext = NULL;
     DltDaemonApplication *app = NULL;
-    const char * filename = "/tmp/dlt-runtime-context.cfg";
+    const char *filename = "/tmp/dlt-runtime-context.cfg";
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_contexts_save(&daemon, filename, 0));
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
@@ -1212,43 +1351,43 @@ TEST(t_dlt_daemon_contexts_save, normal)
 }
 TEST(t_dlt_daemon_contexts_save, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-//    const char * filename = "/tmp/dlt-runtime-context.cfg";
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, filename, 0));
-
-    // Verbose != 1 or 0, expect error
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, filename, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Wrong path filename
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, (char *) "PATCH_NOT_EXISTS", 0));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+/*    const char * filename = "/tmp/dlt-runtime-context.cfg"; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, filename, 0)); */
+
+    /* Verbose != 1 or 0, expect error */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, filename, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Wrong path filename */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, (char *) "PATCH_NOT_EXISTS", 0)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_contexts_save, nullpointer)
 {
     DltDaemon daemon;
-    const char * filename = "/tmp/dlt-runtime-context.cfg";
+    const char *filename = "/tmp/dlt-runtime-context.cfg";
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_contexts_save(NULL, NULL, 0));
     EXPECT_GE(-1, dlt_daemon_contexts_save(NULL, filename, 0));
     EXPECT_GE(-1, dlt_daemon_contexts_save(&daemon, NULL, 0));
@@ -1268,17 +1407,29 @@ TEST(t_dlt_daemon_contexts_load, normal)
     char desc[255] = "TEST dlt_daemon_context_add";
     DltDaemonContext *daecontext = NULL;
     DltDaemonApplication *app = NULL;
-    const char * filename = "/tmp/dlt-runtime-context.cfg";
+    const char *filename = "/tmp/dlt-runtime-context.cfg";
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        0,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_contexts_load(&daemon, filename, 0));
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
@@ -1288,43 +1439,43 @@ TEST(t_dlt_daemon_contexts_load, normal)
 }
 TEST(t_dlt_daemon_contexts_load, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-//    const char * filename = "/tmp/dlt-runtime-context.cfg";
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, filename, 0));
-
-    // Verbose != 1 or 0, expect error
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, filename, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-
-    // Wrong path filename
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, (char *) "PATCH_NOT_EXISTS", 0));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+/*    const char * filename = "/tmp/dlt-runtime-context.cfg"; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, filename, 0)); */
+
+    /* Verbose != 1 or 0, expect error */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, filename, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+
+    /* Wrong path filename */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, (char *) "PATCH_NOT_EXISTS", 0)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_contexts_load, nullpointer)
 {
     DltDaemon daemon;
-    const char * filename = "/tmp/dlt-runtime-context.cfg";
+    const char *filename = "/tmp/dlt-runtime-context.cfg";
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_contexts_load(NULL, NULL, 0));
     EXPECT_GE(-1, dlt_daemon_contexts_load(NULL, filename, 0));
     EXPECT_GE(-1, dlt_daemon_contexts_load(&daemon, NULL, 0));
@@ -1343,15 +1494,18 @@ TEST(t_dlt_daemon_contexts_load, nullpointer)
 
 
 /* Begin Method: dlt_daemon_common::dlt_daemon_user_send_all_log_state */
-// Can't test this Method, maybe a return value would be a better solution
+/* Can't test this Method, maybe a return value would be a better solution */
 TEST(t_dlt_daemon_user_send_all_log_state, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
     char ecu[] = "ECU1";
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
@@ -1359,9 +1513,7 @@ TEST(t_dlt_daemon_user_send_all_log_state, normal)
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_user_send_all_log_state, abnormal)
-{
-
-}
+{}
 TEST(t_dlt_daemon_user_send_all_log_state, nullpointer)
 {
     EXPECT_NO_FATAL_FAILURE(dlt_daemon_user_send_all_log_state(NULL, 0));
@@ -1372,15 +1524,18 @@ TEST(t_dlt_daemon_user_send_all_log_state, nullpointer)
 
 
 /* Begin Method: dlt_daemon_common::dlt_daemon_user_send_default_update */
-// Can't test this Method, maybe a return value would be a better solution
+/* Can't test this Method, maybe a return value would be a better solution */
 TEST(t_dlt_daemon_user_send_default_update, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
     char ecu[] = "ECU1";
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
@@ -1388,9 +1543,7 @@ TEST(t_dlt_daemon_user_send_default_update, normal)
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_user_send_default_update, abnormal)
-{
-
-}
+{}
 TEST(t_dlt_daemon_user_send_default_update, nullpointer)
 {
     EXPECT_NO_FATAL_FAILURE(dlt_daemon_user_send_default_update(NULL, 0));
@@ -1413,13 +1566,25 @@ TEST(t_dlt_daemon_user_send_log_level, normal)
     char ecu[] = "ECU1";
     int fd = 42;
 
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
     app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0);
-    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,1,desc,ecu,0);
+    daecontext = dlt_daemon_context_add(&daemon,
+                                        apid,
+                                        ctid,
+                                        DLT_LOG_DEFAULT,
+                                        DLT_TRACE_STATUS_DEFAULT,
+                                        0,
+                                        1,
+                                        desc,
+                                        ecu,
+                                        0);
     EXPECT_LE(0, dlt_daemon_user_send_log_level(&daemon, daecontext, 0));
     EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0));
     EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0));
@@ -1429,42 +1594,42 @@ TEST(t_dlt_daemon_user_send_log_level, normal)
 }
 TEST(t_dlt_daemon_user_send_log_level, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-
-    // Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 0));
-
-    // File Handler <= 0
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,-1,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 0));
-//    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0));
-//    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0));
-//    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0));
-
-    // Verbose != 0 or 1
-//    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,1,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+
+    /* Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 0)); */
+
+    /* File Handler <= 0 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,-1,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); */
+
+    /* Verbose != 0 or 1 */
+/*    app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,1,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, daecontext, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_user_send_log_level, nullpointer)
 {
     DltDaemon daemon;
     DltDaemonContext daecontext;
 
-    // NULL-Pointer
+    /* NULL-Pointer */
     EXPECT_GE(-1, dlt_daemon_user_send_log_level(NULL, NULL, 0));
     EXPECT_GE(-1, dlt_daemon_user_send_log_level(NULL, &daecontext, 0));
     EXPECT_GE(-1, dlt_daemon_user_send_log_level(&daemon, NULL, 0));
@@ -1479,76 +1644,79 @@ TEST(t_dlt_daemon_user_send_log_state, normal)
 {
     DltDaemon daemon;
     DltGateway gateway;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext;
-//    DltDaemonApplication *app;
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext; */
+/*    DltDaemonApplication *app; */
     pid_t pid = 18166;
     char ecu[] = "ECU1";
-    char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE+1];
-    snprintf(filename,DLT_DAEMON_COMMON_TEXTBUFSIZE,"%s/dlt%d",DLT_USER_DIR,pid);
-
-    // Normal Use-Case
-    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+    char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE + 1];
+    snprintf(filename, DLT_DAEMON_COMMON_TEXTBUFSIZE, "%s/dlt%d", DLT_USER_DIR, pid);
+
+    /* Normal Use-Case */
+    EXPECT_EQ(0,
+              dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE,
+                              DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY, DLT_LOG_INFO,
+                              DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, strncmp(daemon.ecuid, daemon.user_list[0].ecu, DLT_ID_SIZE));
-//    open(filename, O_RDWR |O_NONBLOCK);
-//    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0);
-//    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0);
-//    //printf("### USERHANDLE=%i\n", app->user_handle);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(0, dlt_daemon_user_send_log_state(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0));
-//    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0));
-//    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0));
-//    EXPECT_LE(0, close(app->user_handle));
+/*    open(filename, O_RDWR |O_NONBLOCK); */
+/*    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0); */
+/*    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0); */
+/*    //printf("### USERHANDLE=%i\n", app->user_handle); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(0, dlt_daemon_user_send_log_state(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, close(app->user_handle)); */
     EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
 }
 TEST(t_dlt_daemon_user_send_log_state, abnormal)
 {
-//    DltDaemon daemon;
-//    ID4 apid = "TES";
-//    ID4 ctid = "CON";
-//    char desc[255] = "TEST dlt_daemon_context_add";
-//    DltDaemonContext *daecontext = NULL;
-//    DltDaemonApplication *app = NULL;
-//    pid_t pid = 18166;
-//    char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE+1];
-//    snprintf(filename,DLT_DAEMON_COMMON_TEXTBUFSIZE,"%s/dlt%d",DLT_USER_DIR,pid);
-
-    //Uninitialized
-//    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 0));
-
-    // No Pipe open
-    //open(filename, O_RDWR |O_NONBLOCK);
-//    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0);
-//    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0);
-    //printf("### USERHANDLE=%i\n", app->user_handle);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0));
-//    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0));
-//    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0));
-//    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0));
-//    EXPECT_LE(0, close(app->user_handle));
-
-    // Verbose != 1 or 0
-//    open(filename, O_RDWR |O_NONBLOCK);
-//    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0);
-//    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0);
-//    //printf("### USERHANDLE=%i\n", app->user_handle);
-//    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0);
-//    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 123456789));
-//    dlt_daemon_context_del(&daemon, daecontext, 0);
-//    dlt_daemon_application_del(&daemon, app, 0);
-//    dlt_daemon_contexts_clear(&daemon, 0);
-//    dlt_daemon_applications_clear(&daemon, 0);
-//    close(app->user_handle);
-//    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0));
+/*    DltDaemon daemon; */
+/*    ID4 apid = "TES"; */
+/*    ID4 ctid = "CON"; */
+/*    char desc[255] = "TEST dlt_daemon_context_add"; */
+/*    DltDaemonContext *daecontext = NULL; */
+/*    DltDaemonApplication *app = NULL; */
+/*    pid_t pid = 18166; */
+/*    char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE+1]; */
+/*    snprintf(filename,DLT_DAEMON_COMMON_TEXTBUFSIZE,"%s/dlt%d",DLT_USER_DIR,pid); */
+
+    /*Uninitialized */
+/*    EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 0)); */
+
+    /* No Pipe open */
+    /*open(filename, O_RDWR |O_NONBLOCK); */
+/*    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0); */
+/*    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0); */
+    /*printf("### USERHANDLE=%i\n", app->user_handle); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); */
+/*    EXPECT_LE(0, close(app->user_handle)); */
+
+    /* Verbose != 1 or 0 */
+/*    open(filename, O_RDWR |O_NONBLOCK); */
+/*    dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0); */
+/*    app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0); */
+/*    //printf("### USERHANDLE=%i\n", app->user_handle); */
+/*    daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); */
+/*    EXPECT_GE(-1, dlt_daemon_user_send_log_state(&daemon, app, 123456789)); */
+/*    dlt_daemon_context_del(&daemon, daecontext, 0); */
+/*    dlt_daemon_application_del(&daemon, app, 0); */
+/*    dlt_daemon_contexts_clear(&daemon, 0); */
+/*    dlt_daemon_applications_clear(&daemon, 0); */
+/*    close(app->user_handle); */
+/*    EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); */
 }
 TEST(t_dlt_daemon_user_send_log_state, nullpointer)
 {
@@ -1575,7 +1743,7 @@ int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
     ::testing::FLAGS_gtest_break_on_failure = true;
-    //::testing::FLAGS_gtest_filter = "*.normal";
-    //::testing::FLAGS_gtest_repeat = 10000;
+    /*::testing::FLAGS_gtest_filter = "*.normal"; */
+    /*::testing::FLAGS_gtest_repeat = 10000; */
     return RUN_ALL_TESTS();
 }
diff --git a/tests/gtest_dlt_daemon_event_handler.cpp b/tests/gtest_dlt_daemon_event_handler.cpp
index df9caa0..82e01bb 100644
--- a/tests/gtest_dlt_daemon_event_handler.cpp
+++ b/tests/gtest_dlt_daemon_event_handler.cpp
@@ -79,7 +79,7 @@ TEST(t_dlt_daemon_prepare_event_handling, normal)
 
 TEST(t_dlt_daemon_prepare_event_handling, nullpointer)
 {
-    // NULL-Pointer, expect -1
+    /* NULL-Pointer, expect -1 */
     EXPECT_EQ(DLT_RETURN_ERROR, dlt_daemon_prepare_event_handling(NULL));
 }
 
@@ -91,13 +91,13 @@ TEST(t_dlt_daemon_handle_event, normal)
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_daemon_prepare_event_handling(&daemon_local.pEvent));
     EXPECT_EQ(DLT_RETURN_OK, dlt_daemon_handle_event(&daemon_local.pEvent,
-                                       &daemon,
-                                       &daemon_local));
+                                                     &daemon,
+                                                     &daemon_local));
 }
 
 TEST(t_dlt_daemon_handle_event, nullpointer)
 {
-    EXPECT_EQ(DLT_RETURN_ERROR, dlt_daemon_handle_event(NULL,NULL,NULL));
+    EXPECT_EQ(DLT_RETURN_ERROR, dlt_daemon_handle_event(NULL, NULL, NULL));
 }
 
 /* Begin Method: dlt_daemon_event_handler::dlt_event_handler_find_connection*/
@@ -127,7 +127,7 @@ TEST(t_dlt_daemon_add_connection, normal)
     DltReceiver receiver = {};
 
     ev1.connections = (DltConnection *)malloc(sizeof(DltConnection));
-    head = (DltConnection*)ev1.connections;
+    head = (DltConnection *)ev1.connections;
     memset(ev1.connections, 0, sizeof(DltConnection));
     ev1.connections->next = 0;
     ev1.connections->type = DLT_CONNECTION_CLIENT_MSG_SERIAL;
@@ -141,7 +141,7 @@ TEST(t_dlt_daemon_add_connection, normal)
     EXPECT_EQ(DLT_CONNECTION_CLIENT_MSG_SERIAL, ev1.connections->type);
 
     dlt_daemon_add_connection(&ev1, connections1);
-    head = (DltConnection*)ev1.connections->next;
+    head = (DltConnection *)ev1.connections->next;
 
     EXPECT_EQ(DLT_CONNECTION_GATEWAY, head->type);
 
@@ -157,7 +157,7 @@ TEST(t_dlt_daemon_remove_connection, normal)
     DltConnection *connections1 = nullptr;
 
     ev1.connections = (DltConnection *)malloc(sizeof(DltConnection));
-    head = (DltConnection*)ev1.connections;
+    head = (DltConnection *)ev1.connections;
     memset(ev1.connections, 0, sizeof(DltConnection));
     ev1.connections->next = 0;
     ev1.connections->type = DLT_CONNECTION_CLIENT_MSG_SERIAL;
@@ -172,7 +172,7 @@ TEST(t_dlt_daemon_remove_connection, normal)
     EXPECT_EQ(DLT_CONNECTION_CLIENT_MSG_SERIAL, ev1.connections->type);
 
     dlt_daemon_add_connection(&ev1, connections1);
-    head = (DltConnection*)ev1.connections->next;
+    head = (DltConnection *)ev1.connections->next;
 
     EXPECT_EQ(DLT_CONNECTION_GATEWAY, head->type);
 
@@ -208,7 +208,7 @@ TEST(t_dlt_connection_check_activate, normal)
     con.type = DLT_CONNECTION_CLIENT_MSG_TCP;
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_daemon_prepare_event_handling(&evhdl));
-    
+
     ret = dlt_connection_check_activate(&evhdl, &con, ACTIVATE);
     EXPECT_EQ(DLT_RETURN_OK, ret);
 
@@ -300,7 +300,7 @@ TEST(t_dlt_connection_create, normal)
     DltDaemonLocal daemon_local = {};
 
     EXPECT_EQ(DLT_RETURN_OK,
-          dlt_daemon_prepare_event_handling(&daemon_local.pEvent));
+              dlt_daemon_prepare_event_handling(&daemon_local.pEvent));
 
     ret = dlt_connection_create(&daemon_local,
                                 &daemon_local.pEvent,
@@ -417,6 +417,7 @@ TEST(t_dlt_connection_send, normal_1)
     conn.type = DLT_CONNECTION_CLIENT_MSG_TCP;
 
     daemon_local.msg.databuffer = (uint8_t *)malloc(sizeof(uint8_t));
+
     if (daemon_local.msg.databuffer == NULL)
         close(receiver.fd);
 
@@ -447,8 +448,8 @@ TEST(t_dlt_connection_send, normal_2)
     conn.type = DLT_CONNECTION_CLIENT_MSG_SERIAL;
 
     ret = dlt_connection_send(&conn,
-                             (void *)dltSerialHeader,
-                             sizeof(dltSerialHeader));
+                              (void *)dltSerialHeader,
+                              sizeof(dltSerialHeader));
 
     EXPECT_EQ(DLT_RETURN_OK, ret);
 }
@@ -464,8 +465,8 @@ TEST(t_dlt_connection_send, abnormal)
     conn.type = DLT_CONNECTION_TYPE_MAX;
 
     ret = dlt_connection_send(&conn,
-                             (void *)dltSerialHeader,
-                             sizeof(dltSerialHeader));
+                              (void *)dltSerialHeader,
+                              sizeof(dltSerialHeader));
     EXPECT_EQ(DLT_RETURN_ERROR, ret);
 }
 
@@ -493,9 +494,9 @@ TEST(t_dlt_connection_send_multiple, normal_1)
     conn.type = DLT_CONNECTION_CLIENT_MSG_TCP;
 
     daemon_local.msg.headersize = sizeof(DltStorageHeader) +
-                                  sizeof(DltStandardHeader) +
-                                  sizeof(DltStandardHeaderExtra) +
-                                  sizeof(DltExtendedHeader);
+        sizeof(DltStandardHeader) +
+        sizeof(DltStandardHeaderExtra) +
+        sizeof(DltExtendedHeader);
 
     memset(daemon_local.msg.headerbuffer, 0, daemon_local.msg.headersize);
 
@@ -503,6 +504,7 @@ TEST(t_dlt_connection_send_multiple, normal_1)
     size1 = daemon_local.msg.headersize - sizeof(DltStorageHeader);
 
     daemon_local.msg.databuffer = (uint8_t *)malloc(sizeof(uint8_t));
+
     if (daemon_local.msg.databuffer == NULL)
         close(receiver.fd);
 
@@ -515,11 +517,11 @@ TEST(t_dlt_connection_send_multiple, normal_1)
     size2 = daemon_local.msg.datasize;
 
     ret = dlt_connection_send_multiple(&conn,
-                                      data1,
-                                      size1,
-                                      data2,
-                                      size2,
-                                      1);
+                                       data1,
+                                       size1,
+                                       data2,
+                                       size2,
+                                       1);
 
     EXPECT_EQ(DLT_RETURN_OK, ret);
 
@@ -550,9 +552,9 @@ TEST(t_dlt_connection_send_multiple, normal_2)
     conn.type = DLT_CONNECTION_CLIENT_MSG_TCP;
 
     daemon_local.msg.headersize = sizeof(DltStorageHeader) +
-                                  sizeof(DltStandardHeader) +
-                                  sizeof(DltStandardHeaderExtra) +
-                                  sizeof(DltExtendedHeader);
+        sizeof(DltStandardHeader) +
+        sizeof(DltStandardHeaderExtra) +
+        sizeof(DltExtendedHeader);
 
     memset(daemon_local.msg.headerbuffer, 0, daemon_local.msg.headersize);
 
@@ -560,6 +562,7 @@ TEST(t_dlt_connection_send_multiple, normal_2)
     size1 = daemon_local.msg.headersize - sizeof(DltStorageHeader);
 
     daemon_local.msg.databuffer = (uint8_t *)malloc(sizeof(uint8_t));
+
     if (daemon_local.msg.databuffer == NULL)
         close(receiver.fd);
 
@@ -572,11 +575,11 @@ TEST(t_dlt_connection_send_multiple, normal_2)
     size2 = daemon_local.msg.datasize;
 
     ret = dlt_connection_send_multiple(&conn,
-                                      data1,
-                                      size1,
-                                      data2,
-                                      size2,
-                                      0);
+                                       data1,
+                                       size1,
+                                       data2,
+                                       size2,
+                                       0);
 
     EXPECT_EQ(DLT_RETURN_OK, ret);
 
@@ -599,11 +602,11 @@ TEST(t_dlt_connection_send_multiple, nullpointer)
     size2 = daemon_local.msg.datasize;
 
     ret = dlt_connection_send_multiple(NULL,
-                                      data1,
-                                      size1,
-                                      data2,
-                                      size2,
-                                      0);
+                                       data1,
+                                       size1,
+                                       data2,
+                                       size2,
+                                       0);
 
     EXPECT_EQ(DLT_RETURN_ERROR, ret);
 }
@@ -617,15 +620,14 @@ int connectServer(void)
     portno = 8080;
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     server = gethostbyname("127.0.0.1");
-    memset((char *) &serv_addr, 0, sizeof(serv_addr));
+    memset((char *)&serv_addr, 0, sizeof(serv_addr));
     serv_addr.sin_family = AF_INET;
     memcpy((char *)&serv_addr.sin_addr.s_addr,
            (char *)server->h_addr,
            server->h_length);
     serv_addr.sin_port = htons(portno);
 
-    if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
-    {
+    if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
         printf("Error: %s (%d) occured in connect socket\n",
                strerror(errno),
                errno);
@@ -640,16 +642,14 @@ int connectServer(void)
 
 int main(int argc, char **argv)
 {
-    pid_t cpid =  fork();
+    pid_t cpid = fork();
 
-    if(cpid == -1)
-    {
+    if (cpid == -1) {
         printf("fork fail\n");
         return -1;
     }
 
-    if (cpid)
-    {
+    if (cpid) {
         int i = GTEST_SOCKS_ACCEPTED;
         int j = 0, optval = 1;
         char buffer[256] = {};
@@ -658,13 +658,12 @@ int main(int argc, char **argv)
         struct sockaddr_in serv_addr = {}, cli_addr = {};
         sockfd = socket(AF_INET, SOCK_STREAM, 0);
 
-        if(sockfd == -1)
-        {
+        if (sockfd == -1) {
             printf("Error in creating socket\n");
             return -1;
         }
 
-        bzero((char *) &serv_addr, sizeof(serv_addr));
+        bzero((char *)&serv_addr, sizeof(serv_addr));
         portno = 8080;
 
         serv_addr.sin_family = AF_INET;
@@ -681,24 +680,23 @@ int main(int argc, char **argv)
             exit(1);
         }
 
-        j = bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr));
-        if(j == -1)
-        {
+        j = bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
+
+        if (j == -1) {
             perror("Bind Error\n");
             close(sockfd);
             return -1;
         }
 
         listen(sockfd, 5);
-        while(i)
-        {
+
+        while (i) {
             clilen = sizeof(cli_addr);
             newsockfd[i - 1] = accept(sockfd,
                                       (struct sockaddr *)&cli_addr,
                                       &clilen);
 
-            if(newsockfd[i - 1] == -1)
-            {
+            if (newsockfd[i - 1] == -1) {
                 printf("Error in accept");
                 return -1;
             }
@@ -708,18 +706,18 @@ int main(int argc, char **argv)
             i--;
         }
 
-        for(j = 0; j < GTEST_SOCKS_ACCEPTED; j++)
+        for (j = 0; j < GTEST_SOCKS_ACCEPTED; j++)
             close(newsockfd[i]);
 
         close(sockfd);
     }
-    else
-    {
+    else {
 
         ::testing::InitGoogleTest(&argc, argv);
         ::testing::FLAGS_gtest_break_on_failure = false;
-//        ::testing::FLAGS_gtest_filter = "t_dlt_event_handler_register_connection*";
+/*        ::testing::FLAGS_gtest_filter = "t_dlt_event_handler_register_connection*"; */
         return RUN_ALL_TESTS();
     }
+
     return 0;
 }
diff --git a/tests/gtest_dlt_daemon_gateway.cpp b/tests/gtest_dlt_daemon_gateway.cpp
index d07c35d..af9d865 100644
--- a/tests/gtest_dlt_daemon_gateway.cpp
+++ b/tests/gtest_dlt_daemon_gateway.cpp
@@ -81,7 +81,7 @@ TEST(t_dlt_gateway_init, normal)
     daemon_local.pEvent.max_nfds = 0;
     daemon_local.pEvent.connections->receiver = &receiver;
     daemon_local.pEvent.connections->next = NULL;
-    memset(daemon_local.flags.gatewayConfigFile,0,DLT_DAEMON_FLAG_MAX);
+    memset(daemon_local.flags.gatewayConfigFile, 0, DLT_DAEMON_FLAG_MAX);
     strncpy(daemon_local.flags.gatewayConfigFile, "/tmp/dlt_gateway.conf", DLT_DAEMON_FLAG_MAX - 1);
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_init(&daemon_local, 1));
@@ -109,13 +109,16 @@ TEST(t_dlt_gateway_send_control_message, Normal)
     daemon_local.pEvent.nfds = 0;
     daemon_local.pEvent.max_nfds = 0;
     daemon_local.pEvent.connections->receiver = &receiver1;
-    memset(daemon_local.flags.gatewayConfigFile,0,DLT_DAEMON_FLAG_MAX);
+    memset(daemon_local.flags.gatewayConfigFile, 0, DLT_DAEMON_FLAG_MAX);
     strncpy(daemon_local.flags.gatewayConfigFile, "/tmp/dlt_gateway.conf", DLT_DAEMON_FLAG_MAX - 1);
     ret = dlt_gateway_init(&daemon_local, 0);
 
     EXPECT_EQ(DLT_RETURN_OK, ret);
 
-    dlt_gateway_send_control_message(daemon_local.pGateway.connections, daemon_local.pGateway.connections->p_control_msgs, NULL, 0);
+    dlt_gateway_send_control_message(daemon_local.pGateway.connections,
+                                     daemon_local.pGateway.connections->p_control_msgs,
+                                     NULL,
+                                     0);
     dlt_gateway_deinit(&daemon_local.pGateway, 0);
 }
 
@@ -154,8 +157,8 @@ TEST(t_dlt_gateway_store_connection, nullpointer)
 {
     DltGateway gateway;
 
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_gateway_store_connection(NULL , NULL, 0));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_gateway_store_connection(&gateway , NULL, 0));
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_gateway_store_connection(NULL, NULL, 0));
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_gateway_store_connection(&gateway, NULL, 0));
 }
 
 /* Begin Method: dlt_gateway::t_dlt_gateway_check_ip*/
@@ -411,7 +414,7 @@ TEST(t_dlt_gateway_parse_get_log_info, normal)
     uint16_t len_app = 0;
     uint16_t len_con = 0;
     int8_t log_level = -1;
-    int8_t trace_status = -1;;
+    int8_t trace_status = -1;
     int offset = 0;
 
     memset(&daemon, 0, sizeof(DltDaemon));
@@ -423,11 +426,11 @@ TEST(t_dlt_gateway_parse_get_log_info, normal)
 
     /* create response message */
     msg.datasize = sizeof(DltServiceGetLogInfoResponse) +
-                   sizeof(AppIDsType) +
-                   sizeof(ContextIDsInfoType) +
-                   strlen(app_description) +
-                   strlen(context_description);
-    msg.databuffer = (uint8_t *) malloc(msg.datasize);
+        sizeof(AppIDsType) +
+        sizeof(ContextIDsInfoType) +
+        strlen(app_description) +
+        strlen(context_description);
+    msg.databuffer = (uint8_t *)malloc(msg.datasize);
     msg.databuffersize = msg.datasize;
     memset(msg.databuffer, 0, msg.datasize);
 
@@ -440,13 +443,13 @@ TEST(t_dlt_gateway_parse_get_log_info, normal)
     memcpy(msg.databuffer + offset, &count_app_ids, sizeof(uint16_t));
     offset += sizeof(uint16_t);
 
-    dlt_set_id((char*)(msg.databuffer + offset), apid);
+    dlt_set_id((char *)(msg.databuffer + offset), apid);
     offset += sizeof(ID4);
 
     memcpy(msg.databuffer + offset, &count_context_ids, sizeof(uint16_t));
     offset += sizeof(uint16_t);
 
-    dlt_set_id((char*)(msg.databuffer + offset), ctid);
+    dlt_set_id((char *)(msg.databuffer + offset), ctid);
     offset += sizeof(ID4);
 
     memcpy(msg.databuffer + offset, &log_level, sizeof(int8_t));
@@ -469,32 +472,32 @@ TEST(t_dlt_gateway_parse_get_log_info, normal)
     memcpy(msg.databuffer + offset, app_description, strlen(app_description));
     offset += strlen(app_description);
 
-    dlt_set_id((char*)(msg.databuffer + offset), com);
+    dlt_set_id((char *)(msg.databuffer + offset), com);
 
-    msg.storageheader = (DltStorageHeader*)msg.headerbuffer;
+    msg.storageheader = (DltStorageHeader *)msg.headerbuffer;
     dlt_set_storageheader(msg.storageheader, "");
 
-    msg.standardheader = (DltStandardHeader*)(msg.headerbuffer + sizeof(DltStorageHeader));
-    msg.standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1 ;
+    msg.standardheader = (DltStandardHeader *)(msg.headerbuffer + sizeof(DltStorageHeader));
+    msg.standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1;
     msg.standardheader->mcnt = 0;
 
     dlt_set_id(msg.headerextra.ecu, ecuid);
     msg.headerextra.tmsp = dlt_uptime();
     dlt_message_set_extraparameters(&msg, 0);
 
-    msg.extendedheader = (DltExtendedHeader*)(msg.headerbuffer +
-                         sizeof(DltStorageHeader) +
-                         sizeof(DltStandardHeader) +
-                         DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp) );
+    msg.extendedheader = (DltExtendedHeader *)(msg.headerbuffer +
+                                               sizeof(DltStorageHeader) +
+                                               sizeof(DltStandardHeader) +
+                                               DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp));
     msg.extendedheader->msin = DLT_MSIN_CONTROL_RESPONSE;
     msg.extendedheader->noar = 1;
     dlt_set_id(msg.extendedheader->apid, "");
     dlt_set_id(msg.extendedheader->ctid, "");
 
     msg.headersize = sizeof(DltStorageHeader) +
-                     sizeof(DltStandardHeader) +
-                     sizeof(DltExtendedHeader) +
-                     DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp);
+        sizeof(DltStandardHeader) +
+        sizeof(DltExtendedHeader) +
+        DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp);
     len = msg.headersize - sizeof(DltStorageHeader) + msg.datasize;
     msg.standardheader->len = DLT_HTOBE_16(len);
 
@@ -521,7 +524,7 @@ TEST(t_dlt_gateway_process_passive_node_messages, normal)
     daemon_local.pGateway.num_connections = 1;
     daemon_local.pGateway.connections->status = DLT_GATEWAY_CONNECTED;
 
-    EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_process_passive_node_messages(&daemon,&daemon_local,&receiver,1));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_process_passive_node_messages(&daemon, &daemon_local, &receiver, 1));
 }
 
 TEST(t_dlt_gateway_process_passive_node_messages, nullpointer)
@@ -550,7 +553,8 @@ TEST(t_dlt_gateway_process_gateway_timer, normal)
     daemon.storage_handle = &storage_handle;
     daemon_local.pEvent.connections->receiver->fd = -1;
 
-    EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_process_gateway_timer(&daemon,&daemon_local,daemon_local.pEvent.connections->receiver,1));
+    EXPECT_EQ(DLT_RETURN_OK,
+              dlt_gateway_process_gateway_timer(&daemon, &daemon_local, daemon_local.pEvent.connections->receiver, 1));
 }
 
 TEST(t_dlt_gateway_process_gateway_timer, nullpointer)
@@ -572,10 +576,10 @@ TEST(t_dlt_gateway_process_on_demand_request, normal)
     connections.ecuid = node_id;
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_process_on_demand_request(&daemon_local.pGateway,
-                                              &daemon_local,
-                                              node_id,
-                                              connection_status,
-                                              1));
+                                                                   &daemon_local,
+                                                                   node_id,
+                                                                   connection_status,
+                                                                   1));
 }
 
 TEST(t_dlt_gateway_process_on_demand_request, abnormal)
@@ -590,10 +594,10 @@ TEST(t_dlt_gateway_process_on_demand_request, abnormal)
     connections.ecuid = node_id;
 
     EXPECT_EQ(DLT_RETURN_ERROR, dlt_gateway_process_on_demand_request(&daemon_local.pGateway,
-                                              &daemon_local,
-                                              node_id,
-                                              connection_status,
-                                              0));
+                                                                      &daemon_local,
+                                                                      node_id,
+                                                                      connection_status,
+                                                                      0));
 }
 
 TEST(t_dlt_gateway_process_on_demand_request, nullpointer)
@@ -612,14 +616,14 @@ TEST(t_dlt_gateway_check_param, normal)
     gateway.connections = &tmp;
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_check_param(&gateway,
-                                          &tmp,
-                                          GW_CONF_IP_ADDRESS,
-                                          value_1));
+                                                     &tmp,
+                                                     GW_CONF_IP_ADDRESS,
+                                                     value_1));
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_check_param(&gateway,
-                                          &tmp,
-                                          GW_CONF_PORT,
-                                          value_2));
+                                                     &tmp,
+                                                     GW_CONF_PORT,
+                                                     value_2));
 }
 
 TEST(t_dlt_gateway_check_param, abnormal)
@@ -630,9 +634,9 @@ TEST(t_dlt_gateway_check_param, abnormal)
     gateway.connections = &tmp;
 
     EXPECT_EQ(DLT_RETURN_ERROR, dlt_gateway_check_param(&gateway,
-                                          &tmp,
-                                          GW_CONF_PORT,
-                                          value_1));
+                                                        &tmp,
+                                                        GW_CONF_PORT,
+                                                        value_1));
 }
 
 TEST(t_dlt_gateway_check_param, nullpointer)
@@ -661,7 +665,7 @@ TEST(t_dlt_gateway_configure, nullpointer)
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
-//    ::testing::FLAGS_gtest_break_on_failure = true;
-//    ::testing::FLAGS_gtest_filter = "t_dlt_gateway_process_passive_node_messages*";
+/*    ::testing::FLAGS_gtest_break_on_failure = true; */
+/*    ::testing::FLAGS_gtest_filter = "t_dlt_gateway_process_passive_node_messages*"; */
     return RUN_ALL_TESTS();
 }
diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp
index 2563e3d..549ac5c 100644
--- a/tests/gtest_dlt_daemon_offline_log.cpp
+++ b/tests/gtest_dlt_daemon_offline_log.cpp
@@ -8,7 +8,7 @@
  * Email       : onkar.palkar@wipro.com
  *
  * History     : 30-Jun-2016
-*/
+ */
 #include <gtest/gtest.h>
 
 int connectServer(void);
@@ -29,7 +29,7 @@ extern "C"
 }
 
 #ifndef DLT_DAEMON_BLOCKING_TEST
-#define DLT_DAEMON_BLOCKING_TEST 1
+#   define DLT_DAEMON_BLOCKING_TEST 1
 #endif
 
 /* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/
@@ -39,10 +39,9 @@ TEST(t_dlt_logstorage_list_add, normal)
     DltLogStorageFilterConfig *data = NULL;
     char key = 1;
 
-    data = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    data = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if (data != NULL)
-    {
+    if (data != NULL) {
         dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG);
 
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(&key, data, &list));
@@ -56,11 +55,10 @@ TEST(t_dlt_logstorage_list_add_config, normal)
     DltLogStorageFilterConfig *data = NULL;
     DltLogStorageFilterConfig *listdata = NULL;
 
-    data = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
-    listdata = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    data = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
+    listdata = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if ((data != NULL) && (listdata != NULL))
-    {
+    if ((data != NULL) && (listdata != NULL)) {
         dlt_logstorage_list_add_config(data, &listdata);
         free(data);
         free(listdata);
@@ -74,10 +72,9 @@ TEST(t_dlt_logstorage_list_destroy, normal)
     DltLogStorageFilterConfig *data = NULL;
     char key = 1;
 
-    data = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    data = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if (data != NULL)
-    {
+    if (data != NULL) {
         dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG);
 
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(&key, data, &list));
@@ -95,24 +92,23 @@ TEST(t_dlt_logstorage_list_find, normal)
     char apid[] = "1234";
     char ctid[] = "5678";
 
-    data = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    data = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if (data != NULL)
-    {
+    if (data != NULL) {
         data->apids = strdup(apid);
         data->ctids = strdup(ctid);
         dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG);
 
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(key, data, &list));
 
-        retData = (DltLogStorageFilterConfig*)dlt_logstorage_list_find(key, &list);
+        retData = (DltLogStorageFilterConfig *)dlt_logstorage_list_find(key, &list);
         EXPECT_NE((DltLogStorageFilterConfig *)NULL, retData);
 
-        if (retData != NULL)
-        {
+        if (retData != NULL) {
             EXPECT_STREQ(apid, retData->apids);
             EXPECT_STREQ(ctid, retData->ctids);
         }
+
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, 0));
     }
 }
@@ -127,10 +123,9 @@ TEST(t_dlt_logstorage_free, normal)
     handle.num_configs = 0;
     handle.config_list = NULL;
 
-    data = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    data = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if(data != NULL)
-    {
+    if (data != NULL) {
         dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG);
 
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(&key, data, &handle.config_list));
@@ -244,8 +239,8 @@ TEST(t_dlt_logstorage_read_list_of_names, normal)
     char value[] = "a,b,c,d";
 
     namesPtr = (char *)calloc (1, sizeof(char));
-    if(namesPtr != NULL)
-    {
+
+    if (namesPtr != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_read_list_of_names(&namesPtr, value));
 
         free(namesPtr);
@@ -263,8 +258,8 @@ TEST(t_dlt_logstorage_check_apids, normal)
     char value[] = "a,b,c,d";
     DltLogStorageFilterConfig config;
     config.apids = (char *)calloc (1, sizeof(char));
-    if(config.apids != NULL)
-    {
+
+    if (config.apids != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_apids(&config, value));
 
         free(config.apids);
@@ -282,8 +277,8 @@ TEST(t_dlt_logstorage_check_ctids, normal)
     char value[] = "a,b,c,d";
     DltLogStorageFilterConfig config;
     config.ctids = (char *)calloc (1, sizeof(char));
-    if(config.ctids != NULL)
-    {
+
+    if (config.ctids != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_ctids(&config, value));
 
         free(config.ctids);
@@ -316,8 +311,8 @@ TEST(t_dlt_logstorage_check_filename, normal)
     char value[] = "file_name";
     DltLogStorageFilterConfig config;
     config.file_name = (char *)calloc (1, sizeof(char));
-    if(config.file_name != NULL)
-    {
+
+    if (config.file_name != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_filename(&config, value));
 
         free(config.file_name);
@@ -329,8 +324,8 @@ TEST(t_dlt_logstorage_check_filename, abnormal)
     char value[] = "../file_name";
     DltLogStorageFilterConfig config;
     config.file_name = (char *)calloc (1, sizeof(char));
-    if(config.file_name != NULL)
-    {
+
+    if (config.file_name != NULL) {
         EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_check_filename(&config, value));
 
         free(config.file_name);
@@ -404,12 +399,12 @@ TEST(t_dlt_logstorage_check_ecuid, normal)
     char value[] = "213";
     DltLogStorageFilterConfig config;
     config.ecuid = (char *)calloc (1, sizeof(char));
-    if(config.ecuid != NULL)
-    {
+
+    if (config.ecuid != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_ecuid(&config, value));
         EXPECT_EQ('2', *config.ecuid);
-        EXPECT_EQ('1', *(config.ecuid+1));
-        EXPECT_EQ('3', *(config.ecuid+2));
+        EXPECT_EQ('1', *(config.ecuid + 1));
+        EXPECT_EQ('3', *(config.ecuid + 2));
 
         free(config.ecuid);
     }
@@ -426,7 +421,7 @@ TEST(t_dlt_logstorage_check_param, normal)
     char value[] = "100";
     DltLogStorageFilterConfig config;
 
-    EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_param(&config, DLT_LOGSTORAGE_FILTER_CONF_FILESIZE,  value));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_check_param(&config, DLT_LOGSTORAGE_FILTER_CONF_FILESIZE, value));
     EXPECT_EQ(100, config.file_size);
 }
 
@@ -514,17 +509,16 @@ TEST(t_dlt_logstorage_get_loglevel_by_key, normal)
 {
     char arr[] = "abc";
     char *key = arr;
-    DltLogStorageFilterConfig* config = NULL;
+    DltLogStorageFilterConfig *config = NULL;
     DltLogStorage handle;
     handle.config_status = 0;
     handle.connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED;
     handle.config_status = DLT_OFFLINE_LOGSTORAGE_CONFIG_DONE;
     handle.config_list = NULL;
 
-    config = (DltLogStorageFilterConfig *) calloc(1, sizeof(DltLogStorageFilterConfig));
+    config = (DltLogStorageFilterConfig *)calloc(1, sizeof(DltLogStorageFilterConfig));
 
-    if (config != NULL)
-    {
+    if (config != NULL) {
         config->log_level = DLT_LOG_ERROR;
 
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(key, config, &(handle.config_list)));
@@ -556,7 +550,7 @@ TEST(t_dlt_logstorage_get_config, normal)
     char key0[] = ":1234:\000\000\000\000";
     char key1[] = "::5678\000\000\000\000";
     char key2[] = ":1234:5678";
-    DltLogStorageFilterConfig *config[3] = {0};
+    DltLogStorageFilterConfig *config[3] = { 0 };
     DltLogStorage handle;
     handle.connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED;
     handle.config_status = DLT_OFFLINE_LOGSTORAGE_CONFIG_DONE;
@@ -596,7 +590,7 @@ TEST(t_dlt_logstorage_filter, normal)
     char key0[] = ":1234:\000\000\000\000";
     char key1[] = "::5678\000\000\000\000";
     char key2[] = ":1234:5678";
-    DltLogStorageFilterConfig *config[DLT_OFFLINE_LOGSTORAGE_MAX_POSSIBLE_CONFIGS] = {0};
+    DltLogStorageFilterConfig *config[DLT_OFFLINE_LOGSTORAGE_MAX_POSSIBLE_CONFIGS] = { 0 };
     DltLogStorage handle;
     handle.connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED;
     handle.config_status = DLT_OFFLINE_LOGSTORAGE_CONFIG_DONE;
@@ -613,7 +607,7 @@ TEST(t_dlt_logstorage_filter, normal)
 
 TEST(t_dlt_logstorage_filter, null)
 {
-    DltLogStorageFilterConfig *config[3] = {0};
+    DltLogStorageFilterConfig *config[3] = { 0 };
     int num = dlt_logstorage_filter(NULL, config, NULL, NULL, NULL, 0);
     EXPECT_EQ(DLT_RETURN_ERROR, num);
 }
@@ -681,7 +675,7 @@ TEST(t_dlt_logstorage_sync_caches, normal)
 /* Begin Method: dlt_logstorage::t_dlt_logstorage_log_file_name*/
 TEST(t_dlt_logstorage_log_file_name, normal)
 {
-    char log_file_name[DLT_MOUNT_PATH_MAX] = {'\0'};
+    char log_file_name[DLT_MOUNT_PATH_MAX] = { '\0' };
     DltLogStorageUserConfig file_config;
     file_config.logfile_delimiter = '/';
     file_config.logfile_maxcounter = 0;
@@ -704,13 +698,13 @@ TEST(t_dlt_logstorage_log_file_name, null)
 /* Begin Method: dlt_logstorage::t_dlt_logstorage_sort_file_name*/
 TEST(t_dlt_logstorage_sort_file_name, normal)
 {
-    DltLogStorageFileList *node1, *node2, *node3;;
+    DltLogStorageFileList *node1, *node2, *node3;
     DltLogStorageFileList **head;
     node1 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
     node2 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
     node3 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
-    if(node1 != NULL && node2 != NULL && node3 != NULL)
-    {
+
+    if ((node1 != NULL) && (node2 != NULL) && (node3 != NULL)) {
         node1->next = node2;
         node2->next = node3;
         node3->next = NULL;
@@ -736,18 +730,15 @@ TEST(t_dlt_logstorage_sort_file_name, normal)
         node2 = NULL;
         node3 = NULL;
     }
-    if(node1 != NULL)
-    {
+
+    if (node1 != NULL)
         free(node1);
-    }
-    if(node2 != NULL)
-    {
+
+    if (node2 != NULL)
         free(node2);
-    }
-    if(node3 != NULL)
-    {
+
+    if (node3 != NULL)
         free(node3);
-    }
 }
 
 TEST(t_dlt_logstorage_sort_file_name, null)
@@ -758,13 +749,13 @@ TEST(t_dlt_logstorage_sort_file_name, null)
 /* Begin Method: dlt_logstorage::t_dlt_logstorage_rearrange_file_name*/
 TEST(t_dlt_logstorage_rearrange_file_name, normal)
 {
-    DltLogStorageFileList *node1, *node2, *node3;;
+    DltLogStorageFileList *node1, *node2, *node3;
     DltLogStorageFileList **head;
     node1 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
     node2 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
     node3 = (DltLogStorageFileList *)calloc (1, sizeof(DltLogStorageFileList));
-    if((node1 != NULL) && (node2 != NULL) && (node3 != NULL))
-    {
+
+    if ((node1 != NULL) && (node2 != NULL) && (node3 != NULL)) {
 
         node1->next = node2;
         node2->next = node3;
@@ -792,18 +783,15 @@ TEST(t_dlt_logstorage_rearrange_file_name, normal)
         node2 = NULL;
         node3 = NULL;
     }
-    if(node1 != NULL)
-    {
+
+    if (node1 != NULL)
         free(node1);
-    }
-    if(node2 != NULL)
-    {
+
+    if (node2 != NULL)
         free(node2);
-    }
-    if(node3 != NULL)
-    {
+
+    if (node3 != NULL)
         free(node3);
-    }
 }
 
 TEST(t_dlt_logstorage_rearrange_file_name, null)
@@ -815,11 +803,11 @@ TEST(t_dlt_logstorage_rearrange_file_name, null)
 TEST(t_dlt_logstorage_get_idx_of_log_file, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *file = (char*)"Test_002_20160509_191132.dlt";
+    char *file = (char *)"Test_002_20160509_191132.dlt";
 
     EXPECT_EQ(2, dlt_logstorage_get_idx_of_log_file(&file_config, file));
 }
@@ -832,17 +820,17 @@ TEST(t_dlt_logstorage_get_idx_of_log_file, null)
 TEST(t_dlt_logstorage_storage_dir_info, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test_002_20160509_191132.dlt";
+    config.file_name = (char *)"Test_002_20160509_191132.dlt";
     config.records = NULL;
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_storage_dir_info(&file_config, path, &config));
@@ -856,17 +844,17 @@ TEST(t_dlt_logstorage_storage_dir_info, null)
 TEST(t_dlt_logstorage_open_log_file, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
 
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_open_log_file(&config, &file_config, path, 1));
@@ -880,17 +868,17 @@ TEST(t_dlt_logstorage_open_log_file, null)
 TEST(t_dlt_logstorage_prepare_on_msg, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
 
@@ -906,17 +894,17 @@ TEST(t_dlt_logstorage_prepare_on_msg, null)
 TEST(t_dlt_logstorage_write_on_msg, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     unsigned int size = 8;
@@ -943,7 +931,7 @@ TEST(t_dlt_logstorage_sync_on_msg, normal)
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     char *path = NULL;
@@ -960,17 +948,17 @@ TEST(t_dlt_logstorage_sync_on_msg, null)
 TEST(t_dlt_logstorage_prepare_msg_cache, normal)
 {
     DltLogStorageUserConfig file_config;
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 2;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     config.cache = NULL;
@@ -999,8 +987,8 @@ TEST(t_dlt_logstorage_write_msg_cache, normal)
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
 
     config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter));
-    if(config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         config.file_size = 50;
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
 
@@ -1057,7 +1045,7 @@ TEST(t_dlt_logstorage_update_all_contexts, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_update_all_contexts(&daemon, &daemon_local, apid, 1, 1, ecu, 0));
@@ -1097,13 +1085,13 @@ TEST(t_dlt_logstorage_update_context, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
-    app = dlt_daemon_application_add(&daemon, apid, getpid() , desc, fd, ecu, 0);
+    app = dlt_daemon_application_add(&daemon, apid, getpid(), desc, fd, ecu, 0);
     daecontext = dlt_daemon_context_add(&daemon, apid, ctid, DLT_LOG_DEFAULT,
-                       DLT_TRACE_STATUS_DEFAULT, 0, app->user_handle, desc, daemon.ecuid, 0);
-    EXPECT_NE((DltDaemonContext*)(NULL), daecontext);
+                                        DLT_TRACE_STATUS_DEFAULT, 0, app->user_handle, desc, daemon.ecuid, 0);
+    EXPECT_NE((DltDaemonContext *)(NULL), daecontext);
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_update_context(&daemon, &daemon_local, apid, ctid, ecu, 1, 0));
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_update_context(&daemon, &daemon_local, apid, ctid, ecu, 0, 0));
 }
@@ -1142,15 +1130,15 @@ TEST(t_dlt_logstorage_update_context_loglevel, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
     app = dlt_daemon_application_add(&daemon, apid, getpid(), desc, fd, ecu, 0);
     daecontext = dlt_daemon_context_add(&daemon, apid, ctid, DLT_LOG_DEFAULT,
-                       DLT_TRACE_STATUS_DEFAULT, 0, app->user_handle, desc, daemon.ecuid, 0);
-    EXPECT_NE((DltDaemonContext*)(NULL), daecontext);
+                                        DLT_TRACE_STATUS_DEFAULT, 0, app->user_handle, desc, daemon.ecuid, 0);
+    EXPECT_NE((DltDaemonContext *)(NULL), daecontext);
     EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_update_context_loglevel
-                                                        (&daemon, &daemon_local, key, 1, 0));
+                  (&daemon, &daemon_local, key, 1, 0));
 }
 
 TEST(t_dlt_logstorage_update_context_loglevel, null)
@@ -1179,7 +1167,7 @@ TEST(t_dlt_daemon_logstorage_reset_application_loglevel, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
     EXPECT_NO_THROW(dlt_daemon_logstorage_reset_application_loglevel(&daemon, &daemon_local, device_index, 1, 0));
@@ -1221,7 +1209,7 @@ TEST(t_dlt_daemon_logstorage_get_loglevel, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
 
@@ -1273,7 +1261,7 @@ TEST(t_dlt_daemon_logstorage_update_application_loglevel, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
 
@@ -1307,7 +1295,7 @@ TEST(t_dlt_daemon_logstorage_write, normal)
                                  DLT_DAEMON_RINGBUFFER_MAX_SIZE,
                                  DLT_DAEMON_RINGBUFFER_STEP_SIZE,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0));
     daemon.storage_handle = &storage_handle;
@@ -1324,7 +1312,7 @@ TEST(t_dlt_daemon_logstorage_write, normal)
     unsigned char data1[] = "123";
     unsigned char data2[] = "123";
     unsigned char data3[] = "123";
-    int size = 10 * sizeof(uint32_t);;
+    int size = 10 * sizeof(uint32_t);
     daemon.storage_handle->connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED;
     daemon.storage_handle->config_status = DLT_OFFLINE_LOGSTORAGE_CONFIG_DONE;
     daemon.storage_handle->config_list = NULL;
@@ -1345,7 +1333,7 @@ TEST(t_dlt_daemon_logstorage_write, normal)
 
 TEST(t_dlt_daemon_logstorage_write, null)
 {
-    EXPECT_NO_THROW(dlt_daemon_logstorage_write(NULL, NULL, NULL, 0, NULL, 0,NULL, 0));
+    EXPECT_NO_THROW(dlt_daemon_logstorage_write(NULL, NULL, NULL, 0, NULL, 0, NULL, 0));
 }
 
 /* Begin Method: dlt_logstorage::t_dlt_daemon_logstorage_setup_internal_storage*/
@@ -1368,7 +1356,7 @@ TEST(t_dlt_daemon_logstorage_setup_internal_storage, normal)
                                  daemon_local.RingbufferMaxSize,
                                  daemon_local.RingbufferStepSize,
                                  DLT_RUNTIME_DEFAULT_DIRECTORY,
-                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0));
+                                 DLT_LOG_INFO, DLT_TRACE_STATUS_OFF, 0, 0));
 
     dlt_set_id(daemon.ecuid, ecu);
     EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &daemon_local.pGateway, 0, 0));
@@ -1465,30 +1453,30 @@ TEST(t_dlt_daemon_logstorage_get_device, null)
 /* Begin Method: dlt_logstorage::t_dlt_logstorage_find_dlt_header*/
 TEST(t_dlt_logstorage_find_dlt_header, normal)
 {
-    char data[] = {'a','b','D','L','T',0x01};
+    char data[] = { 'a', 'b', 'D', 'L', 'T', 0x01 };
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     config.cache = calloc(1, sizeof(data));
-    if (config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         strncpy((char *)config.cache, data, sizeof(data));
         /* DLT header starts from index 2 */
-        EXPECT_EQ(2, dlt_logstorage_find_dlt_header(config.cache, 0,sizeof(data)));
+        EXPECT_EQ(2, dlt_logstorage_find_dlt_header(config.cache, 0, sizeof(data)));
         free(config.cache);
     }
 }
 
 TEST(t_dlt_logstorage_find_dlt_header, null)
 {
-    char data[] = {'N','o','H','e','a','d','e','r'};
+    char data[] = { 'N', 'o', 'H', 'e', 'a', 'd', 'e', 'r' };
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     config.cache = calloc(1, sizeof(data));
-    if (config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         /* config.cache =(void *) "a,b,D,L,T,0x01"; */
         strncpy((char *)config.cache, data, sizeof(data));
-        EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_find_dlt_header(config.cache, 0,sizeof(data)));
+        EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_find_dlt_header(config.cache, 0, sizeof(data)));
         free(config.cache);
     }
 }
@@ -1498,18 +1486,18 @@ TEST(t_dlt_logstorage_sync_create_new_file, normal)
 {
     DltLogStorageUserConfig file_config;
     memset(&file_config, 0, sizeof(DltLogStorageUserConfig));
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 5;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     config.cache = NULL;
@@ -1524,11 +1512,11 @@ TEST(t_dlt_logstorage_sync_create_new_file, normal)
     DltLogStorageCacheFooter *footer = NULL;
 
     config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter));
-    if(config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         footer = (DltLogStorageCacheFooter *)((unsigned char *)config.cache + 50);
-        if (footer != NULL)
-        {
+
+        if (footer != NULL) {
             EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1));
             EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
             footer->offset = 0;
@@ -1537,7 +1525,6 @@ TEST(t_dlt_logstorage_sync_create_new_file, normal)
             config.cache = NULL;
         }
     }
-
 }
 
 TEST(t_dlt_logstorage_sync_create_new_file, null)
@@ -1550,18 +1537,18 @@ TEST(t_dlt_logstorage_sync_to_file, normal)
 {
     DltLogStorageUserConfig file_config;
     memset(&file_config, 0, sizeof(DltLogStorageUserConfig));
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 6;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     config.cache = NULL;
@@ -1576,8 +1563,8 @@ TEST(t_dlt_logstorage_sync_to_file, normal)
     unsigned char data3[10] = "dlt_data2";
 
     config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter));
-    if(config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1));
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_to_file(&config, &file_config, path));
@@ -1596,18 +1583,18 @@ TEST(t_dlt_logstorage_sync_capable_data_to_file, normal)
 {
     DltLogStorageUserConfig file_config;
     memset(&file_config, 0, sizeof(DltLogStorageUserConfig));
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 7;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
     char apids;
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     config.cache = NULL;
@@ -1622,13 +1609,13 @@ TEST(t_dlt_logstorage_sync_capable_data_to_file, normal)
     unsigned char data3[10] = "Dlt_data2";
 
     config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter));
-    if(config.cache != NULL)
-    {
-            EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1));
-            EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
-            EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_capable_data_to_file(&config, 0));
-            free(config.cache);
-            config.cache = NULL;
+
+    if (config.cache != NULL) {
+        EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1));
+        EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
+        EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_capable_data_to_file(&config, 0));
+        free(config.cache);
+        config.cache = NULL;
     }
 }
 
@@ -1642,11 +1629,11 @@ TEST(t_dlt_logstorage_sync_msg_cache, normal)
 {
     DltLogStorageUserConfig file_config;
     memset(&file_config, 0, sizeof(DltLogStorageUserConfig));
-    file_config.logfile_timestamp =191132;
-    file_config.logfile_delimiter = {'_'};
+    file_config.logfile_timestamp = 191132;
+    file_config.logfile_delimiter = { '_' };
     file_config.logfile_maxcounter = 8;
     file_config.logfile_counteridxlen = 2;
-    char *path = (char*)"/tmp";
+    char *path = (char *)"/tmp";
 
     DltLogStorageFilterConfig config;
     memset(&config, 0, sizeof(DltLogStorageFilterConfig));
@@ -1654,7 +1641,7 @@ TEST(t_dlt_logstorage_sync_msg_cache, normal)
     char ctids;
     config.apids = &apids;
     config.ctids = &ctids;
-    config.file_name = (char*)"Test";
+    config.file_name = (char *)"Test";
     config.records = NULL;
     config.log = NULL;
     config.cache = NULL;
@@ -1669,11 +1656,12 @@ TEST(t_dlt_logstorage_sync_msg_cache, normal)
     unsigned char data3[10] = "dlt_dataC";
 
     config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter));
-    if(config.cache != NULL)
-    {
+
+    if (config.cache != NULL) {
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1));
         EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size));
-        EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_msg_cache(&config, &file_config, path, DLT_LOGSTORAGE_SYNC_ON_DEMAND));
+        EXPECT_EQ(DLT_RETURN_OK,
+                  dlt_logstorage_sync_msg_cache(&config, &file_config, path, DLT_LOGSTORAGE_SYNC_ON_DEMAND));
         free(config.cache);
         config.cache = NULL;
     }
@@ -1692,18 +1680,19 @@ int connectServer(void)
     portno = 8080;
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     server = gethostbyname("127.0.0.1");
-    bzero((char *) &serv_addr, sizeof(serv_addr));
+    bzero((char *)&serv_addr, sizeof(serv_addr));
     serv_addr.sin_family = AF_INET;
     memcpy((char *)&serv_addr.sin_addr.s_addr,
            (char *)server->h_addr,
            server->h_length);
     serv_addr.sin_port = htons(portno);
-    if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
-    {
+
+    if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
         printf("Error: %s (%d) occured in connect socket\n", strerror(errno), errno);
         close(sockfd);
         return -1;
     }
+
     return sockfd;
 }
 
@@ -1713,13 +1702,13 @@ int main(int argc, char **argv)
 {
     pid_t cpid;
     cpid = fork();
-    if(cpid == -1)
-    {
+
+    if (cpid == -1) {
         printf("fork fail\n");
         return -1;
     }
-    if (cpid)
-    {
+
+    if (cpid) {
         int i = GTEST_SOCKS_ACCEPTED;
         int j, optval = 1;
         char buffer[256];
@@ -1727,12 +1716,13 @@ int main(int argc, char **argv)
         socklen_t clilen;
         struct sockaddr_in serv_addr, cli_addr;
         sockfd = socket(AF_INET, SOCK_STREAM, 0);
-        if(sockfd == -1)
-        {
+
+        if (sockfd == -1) {
             printf("Error in creating socket\n");
             return -1;
         }
-        bzero((char *) &serv_addr, sizeof(serv_addr));
+
+        bzero((char *)&serv_addr, sizeof(serv_addr));
         portno = 8080;
 
         serv_addr.sin_family = AF_INET;
@@ -1745,40 +1735,42 @@ int main(int argc, char **argv)
             exit(1);
         }
 
-        j = bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr));
-        if(j == -1)
-        {
+        j = bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
+
+        if (j == -1) {
             perror("Bind Error\n");
             close(sockfd);
             return -1;
         }
+
         listen(sockfd, 5);
-        while(i)
-        {
+
+        while (i) {
             clilen = sizeof(cli_addr);
-            newsockfd[i-1] = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
-            if(newsockfd[i-1] == -1)
-            {
+            newsockfd[i - 1] = accept(sockfd, (struct sockaddr *)&cli_addr, &clilen);
+
+            if (newsockfd[i - 1] == -1) {
                 printf("Error in accept");
                 return -1;
             }
+
             memset(buffer, 0, 256);
-            (void)(read(newsockfd[i-1], buffer, 255) + 1); /* just ignore result */
+            (void)(read(newsockfd[i - 1], buffer, 255) + 1); /* just ignore result */
             i--;
         }
 
-        for(j = 0; j < GTEST_SOCKS_ACCEPTED; j++)
+        for (j = 0; j < GTEST_SOCKS_ACCEPTED; j++)
             close(newsockfd[i]);
 
         close(sockfd);
     }
-    else
-    {
+    else {
 
         ::testing::InitGoogleTest(&argc, argv);
         ::testing::FLAGS_gtest_break_on_failure = false;
-//        ::testing::FLAGS_gtest_filter = "t_dlt_event_handler_register_connection*";
+/*        ::testing::FLAGS_gtest_filter = "t_dlt_event_handler_register_connection*"; */
         return RUN_ALL_TESTS();
     }
+
     return 0;
 }
diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp
index c8bf2de..91cc69c 100644
--- a/tests/gtest_dlt_user.cpp
+++ b/tests/gtest_dlt_user.cpp
@@ -23,7 +23,7 @@
  * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
  *
  * \file gtest_dlt_common.cpp
-*/
+ */
 
 #include <stdio.h>
 #include "gtest/gtest.h"
@@ -35,199 +35,199 @@ extern "C" {
 
 
 
-// TEST COMMENTED OUT WITH
-// TODO:
-// DO FAIL!
+/* TEST COMMENTED OUT WITH */
+/* TODO: */
+/* DO FAIL! */
 
 
 
-// tested functions
+/* tested functions */
 /*
-int dlt_user_log_write_start(DltContext *handle, DltContextData *log, DltLogLevelType loglevel);
-int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log, DltLogLevelType loglevel, uint32_t messageid);
-int dlt_user_log_write_finish(DltContextData *log);
-int dlt_user_log_write_bool(DltContextData *log, uint8_t data);
-int dlt_user_log_write_float32(DltContextData *log, float32_t data);
-int dlt_user_log_write_float64(DltContextData *log, double data);
-int dlt_user_log_write_uint(DltContextData *log, unsigned int data);
-int dlt_user_log_write_uint8(DltContextData *log, uint8_t data);
-int dlt_user_log_write_uint16(DltContextData *log, uint16_t data);
-int dlt_user_log_write_uint32(DltContextData *log, uint32_t data);
-int dlt_user_log_write_uint64(DltContextData *log, uint64_t data);
-int dlt_user_log_write_uint8_formatted(DltContextData *log, uint8_t data, DltFormatType type);
-int dlt_user_log_write_uint16_formatted(DltContextData *log, uint16_t data, DltFormatType type);
-int dlt_user_log_write_uint32_formatted(DltContextData *log, uint32_t data, DltFormatType type);
-int dlt_user_log_write_uint64_formatted(DltContextData *log, uint64_t data, DltFormatType type);
-int dlt_user_log_write_int(DltContextData *log, int data);
-int dlt_user_log_write_int8(DltContextData *log, int8_t data);
-int dlt_user_log_write_int16(DltContextData *log, int16_t data);
-int dlt_user_log_write_int32(DltContextData *log, int32_t data);
-int dlt_user_log_write_int64(DltContextData *log, int64_t data);
-int dlt_user_log_write_string( DltContextData *log, const char *text);
-int dlt_user_log_write_constant_string( DltContextData *log, const char *text);
-int dlt_user_log_write_utf8_string(DltContextData *log, const char *text);
-int dlt_user_log_write_raw(DltContextData *log,void *data,uint16_t length);
-int dlt_user_log_write_raw_formatted(DltContextData *log,void *data,uint16_t length,DltFormatType type);
-*/
+ * int dlt_user_log_write_start(DltContext *handle, DltContextData *log, DltLogLevelType loglevel);
+ * int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log, DltLogLevelType loglevel, uint32_t messageid);
+ * int dlt_user_log_write_finish(DltContextData *log);
+ * int dlt_user_log_write_bool(DltContextData *log, uint8_t data);
+ * int dlt_user_log_write_float32(DltContextData *log, float32_t data);
+ * int dlt_user_log_write_float64(DltContextData *log, double data);
+ * int dlt_user_log_write_uint(DltContextData *log, unsigned int data);
+ * int dlt_user_log_write_uint8(DltContextData *log, uint8_t data);
+ * int dlt_user_log_write_uint16(DltContextData *log, uint16_t data);
+ * int dlt_user_log_write_uint32(DltContextData *log, uint32_t data);
+ * int dlt_user_log_write_uint64(DltContextData *log, uint64_t data);
+ * int dlt_user_log_write_uint8_formatted(DltContextData *log, uint8_t data, DltFormatType type);
+ * int dlt_user_log_write_uint16_formatted(DltContextData *log, uint16_t data, DltFormatType type);
+ * int dlt_user_log_write_uint32_formatted(DltContextData *log, uint32_t data, DltFormatType type);
+ * int dlt_user_log_write_uint64_formatted(DltContextData *log, uint64_t data, DltFormatType type);
+ * int dlt_user_log_write_int(DltContextData *log, int data);
+ * int dlt_user_log_write_int8(DltContextData *log, int8_t data);
+ * int dlt_user_log_write_int16(DltContextData *log, int16_t data);
+ * int dlt_user_log_write_int32(DltContextData *log, int32_t data);
+ * int dlt_user_log_write_int64(DltContextData *log, int64_t data);
+ * int dlt_user_log_write_string( DltContextData *log, const char *text);
+ * int dlt_user_log_write_constant_string( DltContextData *log, const char *text);
+ * int dlt_user_log_write_utf8_string(DltContextData *log, const char *text);
+ * int dlt_user_log_write_raw(DltContextData *log,void *data,uint16_t length);
+ * int dlt_user_log_write_raw_formatted(DltContextData *log,void *data,uint16_t length,DltFormatType type);
+ */
 
 /*
-int dlt_log_string(DltContext *handle,DltLogLevelType loglevel, const char *text);
-int dlt_log_string_int(DltContext *handle,DltLogLevelType loglevel, const char *text, int data);
-int dlt_log_string_uint(DltContext *handle,DltLogLevelType loglevel, const char *text, unsigned int data);
-int dlt_log_int(DltContext *handle,DltLogLevelType loglevel, int data);
-int dlt_log_uint(DltContext *handle,DltLogLevelType loglevel, unsigned int data);
-int dlt_log_raw(DltContext *handle,DltLogLevelType loglevel, void *data,uint16_t length);
-int dlt_log_marker();
-*/
+ * int dlt_log_string(DltContext *handle,DltLogLevelType loglevel, const char *text);
+ * int dlt_log_string_int(DltContext *handle,DltLogLevelType loglevel, const char *text, int data);
+ * int dlt_log_string_uint(DltContext *handle,DltLogLevelType loglevel, const char *text, unsigned int data);
+ * int dlt_log_int(DltContext *handle,DltLogLevelType loglevel, int data);
+ * int dlt_log_uint(DltContext *handle,DltLogLevelType loglevel, unsigned int data);
+ * int dlt_log_raw(DltContext *handle,DltLogLevelType loglevel, void *data,uint16_t length);
+ * int dlt_log_marker();
+ */
 
 /*
-int dlt_register_app(const char *appid, const char * description);
-int dlt_unregister_app(void);
-int dlt_register_context(DltContext *handle, const char *contextid, const char * description);
-int dlt_register_context_ll_ts(DltContext *handle, const char *contextid, const char * description, int loglevel, int tracestatus);
-int dlt_unregister_context(DltContext *handle);
-int dlt_register_injection_callback(DltContext *handle, uint32_t service_id, int (*dlt_injection_callback)(uint32_t service_id, void *data, uint32_t length));
-int dlt_register_log_level_changed_callback(DltContext *handle, void (*dlt_log_level_changed_callback)(char context_id[DLT_ID_SIZE],uint8_t log_level, uint8_t trace_status));
-*/
+ * int dlt_register_app(const char *appid, const char * description);
+ * int dlt_unregister_app(void);
+ * int dlt_register_context(DltContext *handle, const char *contextid, const char * description);
+ * int dlt_register_context_ll_ts(DltContext *handle, const char *contextid, const char * description, int loglevel, int tracestatus);
+ * int dlt_unregister_context(DltContext *handle);
+ * int dlt_register_injection_callback(DltContext *handle, uint32_t service_id, int (*dlt_injection_callback)(uint32_t service_id, void *data, uint32_t length));
+ * int dlt_register_log_level_changed_callback(DltContext *handle, void (*dlt_log_level_changed_callback)(char context_id[DLT_ID_SIZE],uint8_t log_level, uint8_t trace_status));
+ */
 
 /*
-int dlt_user_trace_network(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload);
-int dlt_user_trace_network_truncated(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload, int allow_truncate);
-int dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload);
-*/
+ * int dlt_user_trace_network(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload);
+ * int dlt_user_trace_network_truncated(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload, int allow_truncate);
+ * int dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload);
+ */
 
 /*
-int dlt_set_log_mode(DltUserLogMode mode);
-int dlt_get_log_state();
-*/
+ * int dlt_set_log_mode(DltUserLogMode mode);
+ * int dlt_get_log_state();
+ */
 
 /*
-int dlt_verbose_mode(void);
-int dlt_nonverbose_mode(void);
-*/
+ * int dlt_verbose_mode(void);
+ * int dlt_nonverbose_mode(void);
+ */
 
 
 
 
-// define some min and max values (if not present in <limits.h>)
+/* define some min and max values (if not present in <limits.h>) */
 #ifndef UINT8_MIN
-#define UINT8_MIN 0
+#   define UINT8_MIN 0
 #endif
 
 #ifndef UINT16_MIN
-#define UINT16_MIN 0
+#   define UINT16_MIN 0
 #endif
 
 #ifndef UINT32_MIN
-#define UINT32_MIN 0
+#   define UINT32_MIN 0
 #endif
 
 #ifndef UINT64_MIN
-#define UINT64_MIN 0
+#   define UINT64_MIN 0
 #endif
 
 #ifndef UINT8_MAX
-#define UINT8_MAX 255
+#   define UINT8_MAX 255
 #endif
 
 #ifndef UINT16_MAX
-#define UINT16_MAX 65535
+#   define UINT16_MAX 65535
 #endif
 
 #ifndef UINT32_MAX
-#define UINT32_MAX 4294967295
+#   define UINT32_MAX 4294967295
 #endif
 
 #ifndef UINT64_MAX
-#define UINT64_MAX 18446744073709551615UL
+#   define UINT64_MAX 18446744073709551615UL
 #endif
 
 #ifndef INT8_MIN
-#define INT8_MIN -128
+#   define INT8_MIN -128
 #endif
 
 #ifndef INT16_MIN
-#define INT16_MIN -32768
+#   define INT16_MIN -32768
 #endif
 
 #ifndef INT32_MIN
-#define INT32_MIN -2147483648
+#   define INT32_MIN -2147483648
 #endif
 
 #ifndef INT64_MIN
-#define INT64_MIN -9223372036854775807
+#   define INT64_MIN -9223372036854775807
 #endif
 
 #ifndef INT8_MAX
-#define INT8_MAX 127
+#   define INT8_MAX 127
 #endif
 
 #ifndef INT16_MAX
-#define INT16_MAX 32767
+#   define INT16_MAX 32767
 #endif
 
 #ifndef INT32_MAX
-#define INT32_MAX 2147483647
+#   define INT32_MAX 2147483647
 #endif
 
 #ifndef INT64_MAX
-#define INT64_MAX 9223372036854775807
+#   define INT64_MAX 9223372036854775807
 #endif
 
 #ifndef UINT_MIN
-#define UINT_MIN UINT32_MIN
+#   define UINT_MIN UINT32_MIN
 #endif
 
 #ifndef UINT_MAX
-#define UINT_MAX UINT32_MAX
+#   define UINT_MAX UINT32_MAX
 #endif
 
 #ifndef INT_MIN
-#define INT_MIN INT32_MIN
+#   define INT_MIN INT32_MIN
 #endif
 
 #ifndef INT_MAX
-#define INT_MAX INT32_MAX
+#   define INT_MAX INT32_MAX
 #endif
 
-/////////////////////////////////////////
-// start initial dlt
+/*/////////////////////////////////////// */
+/* start initial dlt */
 TEST(t_dlt_init, onetime)
 {
     EXPECT_EQ(DLT_RETURN_OK, dlt_init());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_start
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_start */
 TEST(t_dlt_user_log_write_start, normal)
 {
     DltContext context;
     DltContextData contextData;
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start normal"));
 
-    // the defined enum values for log level
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_FATAL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_ERROR));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_WARN));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_INFO));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEBUG));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_VERBOSE));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* the defined enum values for log level */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_FATAL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_ERROR));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_WARN));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_INFO));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEBUG));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_VERBOSE));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start, abnormal)
@@ -237,18 +237,18 @@ TEST(t_dlt_user_log_write_start, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start abnormal"));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)-100));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)-10));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)10));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)100));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_start(&context, &contextData, (DltLogLevelType) - 100));
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_start(&context, &contextData, (DltLogLevelType) - 10));
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)10));
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_start(&context, &contextData, (DltLogLevelType)100));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start, startstartfinish)
@@ -258,15 +258,16 @@ TEST(t_dlt_user_log_write_start, startstartfinish)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start startstartfinish"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // shouldn't it return -1, because it is already started?
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start startstartfinish"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* shouldn't it return -1, because it is already started? */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start, nullpointer)
@@ -275,21 +276,22 @@ TEST(t_dlt_user_log_write_start, nullpointer)
     DltContextData contextData;
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start nullpointer"));
-    // NULL's
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start(NULL, &contextData, DLT_LOG_DEFAULT));
-    //EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start(NULL, NULL, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start(&context, NULL, DLT_LOG_DEFAULT));
-    //EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start nullpointer"));
+    /* NULL's */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start(NULL, &contextData, DLT_LOG_DEFAULT));
+    /*EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start(NULL, NULL, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start(&context, NULL, DLT_LOG_DEFAULT));
+    /*EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_start_id
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_start_id */
 TEST(t_dlt_user_log_write_start_id, normal)
 {
     DltContext context;
@@ -298,71 +300,72 @@ TEST(t_dlt_user_log_write_start_id, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id normal"));
 
-    // the defined enum values for log level
+    /* the defined enum values for log level */
     messageid = UINT32_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_WARN, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_WARN, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
     messageid = UINT32_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_WARN, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
-
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_WARN, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start_id, abnormal)
 {
     DltContext context;
-    // TODO: DltContextData contextData;
-    // TODO: uint32_t messageid;
+    /* TODO: DltContextData contextData; */
+    /* TODO: uint32_t messageid; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id abnormal"));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: messageid = UINT32_MIN;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)-100, messageid));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)-10, messageid));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)10, messageid));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)100, messageid));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: messageid = UINT32_MIN; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)-100, messageid)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)-10, messageid)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)10, messageid)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, (DltLogLevelType)100, messageid)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start_id, startstartfinish)
@@ -373,17 +376,18 @@ TEST(t_dlt_user_log_write_start_id, startstartfinish)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id startstartfinish"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id startstartfinish"));
 
     messageid = UINT32_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
-    // shouldn't it return -1, because it is already started?
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
+    /* shouldn't it return -1, because it is already started? */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_start_id, nullpointer)
@@ -394,22 +398,23 @@ TEST(t_dlt_user_log_write_start_id, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start_id nullpointer"));
 
-    // NULL's
+    /* NULL's */
     messageid = UINT32_MIN;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(NULL, &contextData, DLT_LOG_DEFAULT, messageid));
-    //EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(NULL, NULL, DLT_LOG_DEFAULT, messageid));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_start_id(&context, NULL, DLT_LOG_DEFAULT, messageid));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start_id(NULL, &contextData, DLT_LOG_DEFAULT, messageid));
+    /*EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start_id(NULL, NULL, DLT_LOG_DEFAULT, messageid));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_start_id(&context, NULL, DLT_LOG_DEFAULT, messageid));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_finish
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_finish */
 TEST(t_dlt_user_log_write_finish, finish)
 {
     DltContext context;
@@ -417,32 +422,32 @@ TEST(t_dlt_user_log_write_finish, finish)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start finish"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_start finish"));
 
-    // finish without start
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(NULL));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
+    /* finish without start */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(NULL)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_finish finish"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_finish finish"));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
 
-    // finish with start and initialized context
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* finish with start and initialized context */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    // 2nd finish
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData));
+    /* 2nd finish */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_finish(&contextData)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_bool
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_bool */
 TEST(t_dlt_user_log_write_bool, normal)
 {
     DltContext context;
@@ -451,44 +456,44 @@ TEST(t_dlt_user_log_write_bool, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = true;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_bool(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_bool(&contextData, data));
     data = false;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_bool(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_bool(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_bool, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: uint8_t data;
+    /* TODO: uint8_t data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = 2;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data));
-    // TODO: data = 100;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data));
-    // TODO: data = UINT8_MAX;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = 2; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data)); */
+    /* TODO: data = 100; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data)); */
+    /* TODO: data = UINT8_MAX; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(&contextData, data)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_bool, nullpointer)
@@ -498,19 +503,20 @@ TEST(t_dlt_user_log_write_bool, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_bool nullpointer"));
 
-    // NULL
+    /* NULL */
     data = true;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_bool(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_bool(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_float32
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_float32 */
 TEST(t_dlt_user_log_write_float32, normal)
 {
     DltContext context;
@@ -519,27 +525,27 @@ TEST(t_dlt_user_log_write_float32, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float32 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float32 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = 3.141592653589793238;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
     data = -3.141592653589793238;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
     data = 0.;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
     data = -0.;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
     data = FLT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
     data = FLT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float32(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_float32, nullpointer)
@@ -549,19 +555,20 @@ TEST(t_dlt_user_log_write_float32, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float32 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float32 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1.;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_float32(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_float32(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_float64
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_float64 */
 TEST(t_dlt_user_log_write_float64, normal)
 {
     DltContext context;
@@ -570,27 +577,27 @@ TEST(t_dlt_user_log_write_float64, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float64 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float64 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = 3.14159265358979323846;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
     data = -3.14159265358979323846;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
     data = 0.;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
     data = -0.;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
     data = DBL_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
     data = DBL_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_float64(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_float64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_float64, nullpointer)
@@ -600,19 +607,20 @@ TEST(t_dlt_user_log_write_float64, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float64 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_float64 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1.;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_float64(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_float64(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint */
 TEST(t_dlt_user_log_write_uint, normal)
 {
     DltContext context;
@@ -621,42 +629,42 @@ TEST(t_dlt_user_log_write_uint, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint(&contextData, data));
     data = UINT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: unsigned int data;
+    /* TODO: unsigned int data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = -1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = -1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint(&contextData, data)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint, nullpointer)
@@ -666,19 +674,20 @@ TEST(t_dlt_user_log_write_uint, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint8
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint8 */
 TEST(t_dlt_user_log_write_uint8, normal)
 {
     DltContext context;
@@ -687,21 +696,21 @@ TEST(t_dlt_user_log_write_uint8, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT8_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8(&contextData, data));
     data = UINT8_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint8, nullpointer)
@@ -711,19 +720,20 @@ TEST(t_dlt_user_log_write_uint8, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint16
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint16 */
 TEST(t_dlt_user_log_write_uint16, normal)
 {
     DltContext context;
@@ -732,21 +742,21 @@ TEST(t_dlt_user_log_write_uint16, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT16_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16(&contextData, data));
     data = UINT16_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint16, nullpointer)
@@ -756,19 +766,20 @@ TEST(t_dlt_user_log_write_uint16, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint32
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint32 */
 TEST(t_dlt_user_log_write_uint32, normal)
 {
     DltContext context;
@@ -777,21 +788,21 @@ TEST(t_dlt_user_log_write_uint32, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT32_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32(&contextData, data));
     data = UINT32_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint32, nullpointer)
@@ -801,19 +812,20 @@ TEST(t_dlt_user_log_write_uint32, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint64
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint64 */
 TEST(t_dlt_user_log_write_uint64, normal)
 {
     DltContext context;
@@ -822,21 +834,21 @@ TEST(t_dlt_user_log_write_uint64, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT64_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64(&contextData, data));
     data = UINT64_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint64, nullpointer)
@@ -846,19 +858,20 @@ TEST(t_dlt_user_log_write_uint64, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint8_formatted
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint8_formatted */
 TEST(t_dlt_user_log_write_uint8_formatted, normal)
 {
     DltContext context;
@@ -867,63 +880,65 @@ TEST(t_dlt_user_log_write_uint8_formatted, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT8_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = UINT8_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint8_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint8_formatted, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: uint8_t data;
+    /* TODO: uint8_t data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)-100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)-10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)100));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)-100)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)-10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(&contextData, data, (DltFormatType)100)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint8_formatted, nullpointer)
@@ -933,25 +948,26 @@ TEST(t_dlt_user_log_write_uint8_formatted, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint8_formatted nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX16));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX32));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX64));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX32));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_HEX64));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint8_formatted(NULL, data, DLT_FORMAT_BIN16));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint16_formatted
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint16_formatted */
 TEST(t_dlt_user_log_write_uint16_formatted, normal)
 {
     DltContext context;
@@ -960,63 +976,65 @@ TEST(t_dlt_user_log_write_uint16_formatted, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT16_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = UINT16_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint16_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint16_formatted, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: uint16_t data;
+    /* TODO: uint16_t data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)-100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)-10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)100));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)-100)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)-10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(&contextData, data, (DltFormatType)100)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint16_formatted, nullpointer)
@@ -1026,25 +1044,26 @@ TEST(t_dlt_user_log_write_uint16_formatted, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint16_formatted nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX16));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX32));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX64));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX32));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_HEX64));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint16_formatted(NULL, data, DLT_FORMAT_BIN16));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint32_formatted
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint32_formatted */
 TEST(t_dlt_user_log_write_uint32_formatted, normal)
 {
     DltContext context;
@@ -1053,63 +1072,65 @@ TEST(t_dlt_user_log_write_uint32_formatted, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT32_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = UINT32_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint32_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint32_formatted, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: uint32_t data;
+    /* TODO: uint32_t data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)-100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)-10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)100));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)-100)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)-10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(&contextData, data, (DltFormatType)100)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint32_formatted, nullpointer)
@@ -1119,25 +1140,26 @@ TEST(t_dlt_user_log_write_uint32_formatted, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint32_formatted nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX16));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX32));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX64));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX32));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_HEX64));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint32_formatted(NULL, data, DLT_FORMAT_BIN16));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_uint64_formatted
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_uint64_formatted */
 TEST(t_dlt_user_log_write_uint64_formatted, normal)
 {
     DltContext context;
@@ -1146,63 +1168,65 @@ TEST(t_dlt_user_log_write_uint64_formatted, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = UINT64_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
     data = UINT64_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_uint64_formatted(&contextData, data, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint64_formatted, abnormal)
 {
     DltContext context;
     DltContextData contextData;
-    // TODO: uint64_t data;
+    /* TODO: uint64_t data; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted abnormal"));
 
-    // abnormal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    // TODO: data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)-100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)-10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)100));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    /* abnormal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* TODO: data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)-100)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)-10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(&contextData, data, (DltFormatType)100)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_uint64_formatted, nullpointer)
@@ -1212,25 +1236,26 @@ TEST(t_dlt_user_log_write_uint64_formatted, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_uint64_formatted nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX16));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX32));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX64));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN8));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX16));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX32));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_HEX64));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN8));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_uint64_formatted(NULL, data, DLT_FORMAT_BIN16));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_int
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_int */
 TEST(t_dlt_user_log_write_int, normal)
 {
     DltContext context;
@@ -1239,25 +1264,25 @@ TEST(t_dlt_user_log_write_int, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = -1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int(&contextData, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int(&contextData, data));
     data = INT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int(&contextData, data));
     data = INT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_int, nullpointer)
@@ -1267,19 +1292,19 @@ TEST(t_dlt_user_log_write_int, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_int(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_int(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_int8
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_int8 */
 TEST(t_dlt_user_log_write_int8, normal)
 {
     DltContext context;
@@ -1288,25 +1313,25 @@ TEST(t_dlt_user_log_write_int8, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int8 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int8 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = -1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int8(&contextData, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int8(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int8(&contextData, data));
     data = INT8_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int8(&contextData, data));
     data = INT8_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int8(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int8(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_int8, nullpointer)
@@ -1316,19 +1341,20 @@ TEST(t_dlt_user_log_write_int8, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int8 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int8 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_int8(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_int8(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_int16
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_int16 */
 TEST(t_dlt_user_log_write_int16, normal)
 {
     DltContext context;
@@ -1337,25 +1363,25 @@ TEST(t_dlt_user_log_write_int16, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int16 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int16 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = -1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int16(&contextData, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int16(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int16(&contextData, data));
     data = INT16_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int16(&contextData, data));
     data = INT16_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int16(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int16(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_int16, nullpointer)
@@ -1365,19 +1391,20 @@ TEST(t_dlt_user_log_write_int16, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int16 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int16 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_int16(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_int16(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_int32
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_int32 */
 TEST(t_dlt_user_log_write_int32, normal)
 {
     DltContext context;
@@ -1386,25 +1413,25 @@ TEST(t_dlt_user_log_write_int32, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int32 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int32 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = -1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int32(&contextData, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int32(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int32(&contextData, data));
     data = INT32_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int32(&contextData, data));
     data = INT32_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int32(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int32(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_int32, nullpointer)
@@ -1414,19 +1441,20 @@ TEST(t_dlt_user_log_write_int32, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int32 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int32 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_int32(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_int32(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_int64
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_int64 */
 TEST(t_dlt_user_log_write_int64, normal)
 {
     DltContext context;
@@ -1435,25 +1463,25 @@ TEST(t_dlt_user_log_write_int64, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int64 normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int64 normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     data = -1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int64(&contextData, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int64(&contextData, data));
     data = 1;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int64(&contextData, data));
     data = INT64_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int64(&contextData, data));
     data = INT64_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_int64(&contextData, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_int64(&contextData, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_int64, nullpointer)
@@ -1463,19 +1491,20 @@ TEST(t_dlt_user_log_write_int64, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int64 nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_int64 nullpointer"));
 
-    // NULL
+    /* NULL */
     data = 1;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_int64(NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_int64(NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_string
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_string */
 TEST(t_dlt_user_log_write_string, normal)
 {
     DltContext context;
@@ -1483,19 +1512,19 @@ TEST(t_dlt_user_log_write_string, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_string normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_string normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_string(&contextData, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_string(&contextData, text1));
     const char *text2 = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_string(&contextData, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_string(&contextData, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_string, nullpointer)
@@ -1505,23 +1534,24 @@ TEST(t_dlt_user_log_write_string, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_string nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_string nullpointer"));
 
-    // NULL
+    /* NULL */
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_string(NULL, text1));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_string(NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_string(&contextData, NULL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_string(NULL, text1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_string(NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_string(&contextData, NULL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_constant_string
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_constant_string */
 TEST(t_dlt_user_log_write_constant_string, normal)
 {
     DltContext context;
@@ -1529,19 +1559,20 @@ TEST(t_dlt_user_log_write_constant_string, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_constant_string normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_constant_string normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_constant_string(&contextData, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_constant_string(&contextData, text1));
     const char *text2 = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_constant_string(&contextData, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_constant_string(&contextData, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_constant_string, nullpointer)
@@ -1551,23 +1582,24 @@ TEST(t_dlt_user_log_write_constant_string, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_constant_string nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_constant_string nullpointer"));
 
-    // NULL
+    /* NULL */
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_constant_string(NULL, text1));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_constant_string(NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_constant_string(&contextData, NULL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_constant_string(NULL, text1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_constant_string(NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_constant_string(&contextData, NULL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_utf8_string
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_utf8_string */
 TEST(t_dlt_user_log_write_utf8_string, normal)
 {
     DltContext context;
@@ -1575,19 +1607,20 @@ TEST(t_dlt_user_log_write_utf8_string, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_utf8_string normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_utf8_string normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_utf8_string(&contextData, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_utf8_string(&contextData, text1));
     const char *text2 = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_utf8_string(&contextData, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_utf8_string(&contextData, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_utf8_string, nullpointer)
@@ -1597,23 +1630,24 @@ TEST(t_dlt_user_log_write_utf8_string, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_utf8_string nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_utf8_string nullpointer"));
 
-    // NULL
+    /* NULL */
     const char *text1 = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_utf8_string(NULL, text1));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_utf8_string(NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_utf8_string(&contextData, NULL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_utf8_string(NULL, text1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_utf8_string(NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_utf8_string(&contextData, NULL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_raw
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_raw */
 TEST(t_dlt_user_log_write_raw, normal)
 {
     DltContext context;
@@ -1621,19 +1655,19 @@ TEST(t_dlt_user_log_write_raw, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     char text1[6] = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw(&contextData, text1, 6));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw(&contextData, text1, 6));
     char text2[1] = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw(&contextData, text2, 0));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw(&contextData, text2, 0));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_raw, nullpointer)
@@ -1643,24 +1677,24 @@ TEST(t_dlt_user_log_write_raw, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw nullpointer"));
 
-    // NULL
+    /* NULL */
     char text1[6] = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(NULL, text1, 6));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(NULL, NULL, 0));
-    EXPECT_GE(DLT_RETURN_OK,dlt_user_log_write_raw(&contextData, NULL, 0));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(&contextData, NULL, 1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw(NULL, text1, 6));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw(NULL, NULL, 0));
+    EXPECT_GE(DLT_RETURN_OK, dlt_user_log_write_raw(&contextData, NULL, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw(&contextData, NULL, 1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_user_log_write_raw_formatted
+/*/////////////////////////////////////// */
+/* t_dlt_user_log_write_raw_formatted */
 TEST(t_dlt_user_log_write_raw_formatted, normal)
 {
     DltContext context;
@@ -1668,31 +1702,32 @@ TEST(t_dlt_user_log_write_raw_formatted, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted normal"));
 
-    // normal values
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    /* normal values */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     char text1[6] = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text1, 6, DLT_FORMAT_BIN16));
     char text2[1] = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX32));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX64));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_BIN8));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_BIN16));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX32));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_HEX64));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_BIN8));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, text2, 0, DLT_FORMAT_BIN16));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_raw_formatted, abnormal)
@@ -1705,24 +1740,26 @@ TEST(t_dlt_user_log_write_raw_formatted, abnormal)
     char buffer[length];
     memset(buffer, '\000', length);
 
-    for(int i = 0; i < length; i++)
+    for (int i = 0; i < length; i++)
         buffer[i] = 'X';
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted abnormal"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_EQ(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted abnormal"));
 
-    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL,dlt_user_log_write_raw_formatted(&contextData, buffer, length, DLT_FORMAT_DEFAULT));
+    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL,
+              dlt_user_log_write_raw_formatted(&contextData, buffer, length, DLT_FORMAT_DEFAULT));
 
-//     undefined values for DltFormatType
-//     shouldn't it return -1?
-//    char text1[6] = "test1";
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)-100));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)-10));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)10));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)100));
+/*     undefined values for DltFormatType */
+/*     shouldn't it return -1? */
+/*    char text1[6] = "test1"; */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)-100)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)-10)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)10)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, text1, 6, (DltFormatType)100)); */
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_log_write_raw_formatted, nullpointer)
@@ -1732,91 +1769,92 @@ TEST(t_dlt_user_log_write_raw_formatted, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_log_write_raw_formatted nullpointer"));
 
-    // NULL
+    /* NULL */
     char text1[6] = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(NULL, text1, 6, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(NULL, NULL, 0, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, NULL, 0, DLT_FORMAT_DEFAULT));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, NULL, 1, DLT_FORMAT_DEFAULT));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw_formatted(NULL, text1, 6, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw_formatted(NULL, NULL, 0, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_OK, dlt_user_log_write_raw_formatted(&contextData, NULL, 0, DLT_FORMAT_DEFAULT));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_user_log_write_raw_formatted(&contextData, NULL, 1, DLT_FORMAT_DEFAULT));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 /*
-int dlt_log_string(DltContext *handle,DltLogLevelType loglevel, const char *text);
-int dlt_log_string_int(DltContext *handle,DltLogLevelType loglevel, const char *text, int data);
-int dlt_log_string_uint(DltContext *handle,DltLogLevelType loglevel, const char *text, unsigned int data);
-int dlt_log_int(DltContext *handle,DltLogLevelType loglevel, int data);
-int dlt_log_uint(DltContext *handle,DltLogLevelType loglevel, unsigned int data);
-int dlt_log_raw(DltContext *handle,DltLogLevelType loglevel, void *data,uint16_t length);
-int dlt_log_marker();
-*/
-
-/////////////////////////////////////////
-// t_dlt_log_string
+ * int dlt_log_string(DltContext *handle,DltLogLevelType loglevel, const char *text);
+ * int dlt_log_string_int(DltContext *handle,DltLogLevelType loglevel, const char *text, int data);
+ * int dlt_log_string_uint(DltContext *handle,DltLogLevelType loglevel, const char *text, unsigned int data);
+ * int dlt_log_int(DltContext *handle,DltLogLevelType loglevel, int data);
+ * int dlt_log_uint(DltContext *handle,DltLogLevelType loglevel, unsigned int data);
+ * int dlt_log_raw(DltContext *handle,DltLogLevelType loglevel, void *data,uint16_t length);
+ * int dlt_log_marker();
+ */
+
+/*/////////////////////////////////////// */
+/* t_dlt_log_string */
 TEST(t_dlt_log_string, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string normal"));
 
-    // normal values
+    /* normal values */
     const char text1[6] = "test1";
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_DEFAULT, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_OFF, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_FATAL, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_ERROR, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_WARN, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_INFO, text1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_VERBOSE, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_DEFAULT, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_OFF, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_FATAL, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_ERROR, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_WARN, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_INFO, text1));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_VERBOSE, text1));
     const char text2[1] = "";
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_DEFAULT, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_OFF, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_FATAL, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_ERROR, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_WARN, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_INFO, text2));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string(&context, DLT_LOG_VERBOSE, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_DEFAULT, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_OFF, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_FATAL, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_ERROR, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_WARN, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_INFO, text2));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string(&context, DLT_LOG_VERBOSE, text2));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string, abnormal)
 {
     DltContext context;
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string abnormal"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string abnormal"));
 
     uint16_t length = DLT_USER_BUF_MAX_SIZE + 10;
     char buffer[length];
     memset(buffer, '\000', length);
 
-    for(int i = 0; i < length - 1; i++)
+    for (int i = 0; i < length - 1; i++)
         buffer[i] = 'X';
 
     EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL, dlt_log_string(&context, DLT_LOG_INFO, buffer));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: const char text1[6] = "test1";
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)-100, text1));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)-10, text1));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)10, text1));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)100, text1));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: const char text1[6] = "test1"; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)-100, text1)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)-10, text1)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)10, text1)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, (DltLogLevelType)100, text1)); */
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string, nullpointer)
@@ -1825,89 +1863,89 @@ TEST(t_dlt_log_string, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string nullpointer"));
 
-    // NULL
+    /* NULL */
     char text1[6] = "test1";
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(NULL, DLT_LOG_DEFAULT, text1));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(NULL, DLT_LOG_DEFAULT, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string(&context, DLT_LOG_DEFAULT, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string(NULL, DLT_LOG_DEFAULT, text1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string(NULL, DLT_LOG_DEFAULT, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string(&context, DLT_LOG_DEFAULT, NULL));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_string_int
+/*/////////////////////////////////////// */
+/* t_dlt_log_string_int */
 TEST(t_dlt_log_string_int, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int normal"));
 
-    // normal values
+    /* normal values */
     const char text1[6] = "test1";
     int data = INT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_DEFAULT, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_OFF, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_FATAL, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_ERROR, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_WARN, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_INFO, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_VERBOSE, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_DEFAULT, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_OFF, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_FATAL, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_ERROR, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_WARN, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_INFO, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_VERBOSE, text1, data));
     const char text2[1] = "";
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_DEFAULT, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_OFF, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_FATAL, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_ERROR, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_WARN, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_INFO, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_VERBOSE, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_DEFAULT, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_OFF, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_FATAL, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_ERROR, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_WARN, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_INFO, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_VERBOSE, text2, data));
     data = INT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_DEFAULT, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_OFF, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_FATAL, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_ERROR, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_WARN, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_INFO, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_int(&context, DLT_LOG_VERBOSE, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_DEFAULT, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_OFF, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_FATAL, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_ERROR, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_WARN, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_INFO, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_int(&context, DLT_LOG_VERBOSE, text2, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string_int, abnormal)
 {
     DltContext context;
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int abnormal"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int abnormal"));
 
     uint16_t length = DLT_USER_BUF_MAX_SIZE + 10;
     char buffer[length];
     memset(buffer, '\000', length);
 
-    for(int i = 0; i < length - 1; i++)
+    for (int i = 0; i < length - 1; i++)
         buffer[i] = 'X';
 
-    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL,dlt_log_string_int(&context, DLT_LOG_INFO, buffer, 1));
+    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL, dlt_log_string_int(&context, DLT_LOG_INFO, buffer, 1));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: const char text1[6] = "test1";
-    // TODO: int data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)-100, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)-10, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)10, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)100, text1, data));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: const char text1[6] = "test1"; */
+    /* TODO: int data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)-100, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)-10, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)10, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, (DltLogLevelType)100, text1, data)); */
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string_int, nullpointer)
@@ -1916,90 +1954,90 @@ TEST(t_dlt_log_string_int, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_int nullpointer"));
 
-    // NULL
+    /* NULL */
     char text1[6] = "test1";
     int data = 0;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(NULL, DLT_LOG_DEFAULT, text1, data));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(NULL, DLT_LOG_DEFAULT, NULL, data));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_int(&context, DLT_LOG_DEFAULT, NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_int(NULL, DLT_LOG_DEFAULT, text1, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_int(NULL, DLT_LOG_DEFAULT, NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_int(&context, DLT_LOG_DEFAULT, NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_string_uint
+/*/////////////////////////////////////// */
+/* t_dlt_log_string_uint */
 TEST(t_dlt_log_string_uint, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint normal"));
 
-    // normal values
+    /* normal values */
     const char text1[6] = "test1";
     unsigned int data = UINT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_OFF, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_FATAL, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_ERROR, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_WARN, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_INFO, text1, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_OFF, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_FATAL, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_ERROR, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_WARN, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_INFO, text1, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text1, data));
     const char text2[1] = "";
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_OFF, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_FATAL, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_ERROR, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_WARN, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_INFO, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_OFF, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_FATAL, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_ERROR, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_WARN, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_INFO, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text2, data));
     data = UINT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_OFF, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_FATAL, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_ERROR, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_WARN, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_INFO, text2, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_DEFAULT, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_OFF, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_FATAL, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_ERROR, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_WARN, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_INFO, text2, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_string_uint(&context, DLT_LOG_VERBOSE, text2, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string_uint, abnormal)
 {
     DltContext context;
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint abnormal"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint abnormal"));
 
     uint16_t length = DLT_USER_BUF_MAX_SIZE + 10;
     char buffer[length];
-    memset(buffer, '\000', DLT_USER_BUF_MAX_SIZE+10);
+    memset(buffer, '\000', DLT_USER_BUF_MAX_SIZE + 10);
 
-    for(int i = 0; i < length - 1; i++)
+    for (int i = 0; i < length - 1; i++)
         buffer[i] = 'X';
 
-    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL,dlt_log_string_uint(&context, DLT_LOG_INFO, buffer, 1));
+    EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL, dlt_log_string_uint(&context, DLT_LOG_INFO, buffer, 1));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: const char text1[6] = "test1";
-    // TODO: unsigned int data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)-100, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)-10, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)10, text1, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)100, text1, data));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: const char text1[6] = "test1"; */
+    /* TODO: unsigned int data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)-100, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)-10, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)10, text1, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, (DltLogLevelType)100, text1, data)); */
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_string_uint, nullpointer)
@@ -2008,59 +2046,59 @@ TEST(t_dlt_log_string_uint, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_string_uint nullpointer"));
 
-    // NULL
+    /* NULL */
     char text1[6] = "test1";
     unsigned int data = 0;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, text1, data));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, NULL, data));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_string_uint(&context, DLT_LOG_DEFAULT, NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, text1, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_uint(NULL, DLT_LOG_DEFAULT, NULL, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_string_uint(&context, DLT_LOG_DEFAULT, NULL, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_int
+/*/////////////////////////////////////// */
+/* t_dlt_log_int */
 TEST(t_dlt_log_int, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int normal"));
 
-    // normal values
+    /* normal values */
     int data = INT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_VERBOSE, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_VERBOSE, data));
     data = INT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_int(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_int(&context, DLT_LOG_VERBOSE, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_int, abnormal)
@@ -2069,19 +2107,19 @@ TEST(t_dlt_log_int, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int abnormal"));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: int data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)-100, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)-10, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)10, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)100, data));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: int data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)-100, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)-10, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)10, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(&context, (DltLogLevelType)100, data)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_int, nullpointer)
@@ -2090,56 +2128,56 @@ TEST(t_dlt_log_int, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_int nullpointer"));
 
-    // NULL
+    /* NULL */
     int data = 0;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_int(NULL, DLT_LOG_DEFAULT, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_int(NULL, DLT_LOG_DEFAULT, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_uint
+/*/////////////////////////////////////// */
+/* t_dlt_log_uint */
 TEST(t_dlt_log_uint, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint normal"));
 
-    // normal values
+    /* normal values */
     unsigned int data = UINT_MIN;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
     data = 0;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
     data = UINT_MAX;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_OFF, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_FATAL, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_ERROR, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_WARN, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_INFO, data));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_DEFAULT, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_OFF, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_FATAL, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_ERROR, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_WARN, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_INFO, data));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_uint(&context, DLT_LOG_VERBOSE, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_uint, abnormal)
@@ -2148,19 +2186,19 @@ TEST(t_dlt_log_uint, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint abnormal"));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-    // TODO: unsigned int data = 1;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)-100, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)-10, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)10, data));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)100, data));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+    /* TODO: unsigned int data = 1; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)-100, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)-10, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)10, data)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(&context, (DltLogLevelType)100, data)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_uint, nullpointer)
@@ -2169,41 +2207,41 @@ TEST(t_dlt_log_uint, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_uint nullpointer"));
 
-    // NULL
+    /* NULL */
     unsigned int data = 0;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_uint(NULL, DLT_LOG_DEFAULT, data));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_uint(NULL, DLT_LOG_DEFAULT, data));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_raw
+/*/////////////////////////////////////// */
+/* t_dlt_log_raw */
 TEST(t_dlt_log_raw, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw normal"));
 
-    // normal values
+    /* normal values */
     char data[5] = "test";
     uint16_t length = 4;
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_OFF, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_FATAL, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_ERROR, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_WARN, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_INFO, data, length));
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_raw(&context, DLT_LOG_VERBOSE, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_DEFAULT, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_OFF, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_FATAL, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_ERROR, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_WARN, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_INFO, data, length));
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_raw(&context, DLT_LOG_VERBOSE, data, length));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_raw, abnormal)
@@ -2212,37 +2250,37 @@ TEST(t_dlt_log_raw, abnormal)
 
 
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw abnormal"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw abnormal"));
 
     uint16_t length = DLT_USER_BUF_MAX_SIZE + 10;
 
     char buffer[length];
     memset(buffer, '\000', length);
 
-    for(int i = 0; i < length; i++)
+    for (int i = 0; i < length; i++)
         buffer[i] = 'X';
 
     EXPECT_EQ(DLT_RETURN_USER_BUFFER_FULL, dlt_log_raw(&context, DLT_LOG_INFO, buffer, length));
 
-    // undefined values for DltLogLevelType
-    // shouldn't it return -1?
-//    char data[5] = "test";
-    // TODO: uint16_t length = 4;
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)-100, data, length));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)-10, data, length));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)10, data, length));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)100, data, length));
+    /* undefined values for DltLogLevelType */
+    /* shouldn't it return -1? */
+/*    char data[5] = "test"; */
+    /* TODO: uint16_t length = 4; */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)-100, data, length)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)-10, data, length)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)10, data, length)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, (DltLogLevelType)100, data, length)); */
 
-    // zero length
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, 0));
+    /* zero length */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, 0)); */
 
-    // negative length
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -1));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -100));
+    /* negative length */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -1)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, data, -100)); */
 
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_EQ(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_log_raw, nullpointer)
@@ -2251,123 +2289,123 @@ TEST(t_dlt_log_raw, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_raw nullpointer"));
 
-    // NULL
+    /* NULL */
     char data[5] = "test";
     uint16_t length = 4;
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(NULL, DLT_LOG_DEFAULT, data, length));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(NULL, DLT_LOG_DEFAULT, NULL, length));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_log_raw(&context, DLT_LOG_DEFAULT, NULL, length));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_raw(NULL, DLT_LOG_DEFAULT, data, length));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_raw(NULL, DLT_LOG_DEFAULT, NULL, length));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_log_raw(&context, DLT_LOG_DEFAULT, NULL, length));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_log_marker
+/*/////////////////////////////////////// */
+/* t_dlt_log_marker */
 TEST(t_dlt_log_marker, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_marker normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_log_marker normal"));
 
-    // normal
-    EXPECT_LE(DLT_RETURN_OK,dlt_log_marker());
+    /* normal */
+    EXPECT_LE(DLT_RETURN_OK, dlt_log_marker());
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_register_app
+/*/////////////////////////////////////// */
+/* t_dlt_register_app */
 TEST(t_dlt_register_app, normal)
 {
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("T", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TU", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUS", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("T", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TU", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUS", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_register_app, abnormal)
 {
 
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("", "dlt_user.c tests"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR1", "dlt_user.c tests"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR123445667", "dlt_user.c tests"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_app("", "dlt_user.c tests"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_unregister_app());
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR1", "dlt_user.c tests")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR123445667", "dlt_user.c tests")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", NULL)); */
 }
 
 TEST(t_dlt_register_app, nullpointer)
 {
 
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app(NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app(NULL, "dlt_user.c tests"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_app(NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_app(NULL, "dlt_user.c tests"));
 
 }
 
-/////////////////////////////////////////
-// t_dlt_unregister_app
+/*/////////////////////////////////////// */
+/* t_dlt_unregister_app */
 TEST(t_dlt_unregister_app, normal)
 {
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("T", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TU", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUS", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("T", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TU", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUS", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_unregister_app, abnormal)
 {
 
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("", "dlt_user.c tests"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR1", "dlt_user.c tests"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR123445667", "dlt_user.c tests"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app());
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_unregister_app());
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_app("", "dlt_user.c tests"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_unregister_app());
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR1", "dlt_user.c tests")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR123445667", "dlt_user.c tests")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_app("TUSR", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_app()); */
 }
 
-/////////////////////////////////////////
-// t_dlt_register_context
+/*/////////////////////////////////////// */
+/* t_dlt_register_context */
 TEST(t_dlt_register_context, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_register_context, abnormal)
@@ -2376,31 +2414,31 @@ TEST(t_dlt_register_context, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "", "d"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "T", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "1"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "1"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, "", "d"));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "T", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, "", ""));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "1")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "1")); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", NULL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal"));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", NULL)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_register_context, nullpointer)
@@ -2408,58 +2446,100 @@ TEST(t_dlt_register_context, nullpointer)
     DltContext context;
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, NULL, "dlt_user.c t_dlt_register_context normal"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, "TEST", NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, NULL, "dlt_user.c t_dlt_register_context normal"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, NULL, "dlt_user.c t_dlt_register_context normal"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, "TEST", NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, NULL, "dlt_user.c t_dlt_register_context normal"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, NULL, NULL));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 
-/////////////////////////////////////////
-// t_dlt_register_context_ll_ts
+/*/////////////////////////////////////// */
+/* t_dlt_register_context_ll_ts */
 TEST(t_dlt_register_context_ll_ts, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_FATAL, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_ERROR, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_WARN, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_INFO, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEBUG, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_VERBOSE, DLT_TRACE_STATUS_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_FATAL, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_ERROR, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_WARN, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_INFO, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEBUG, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_OFF,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_FATAL,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_ERROR,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_WARN,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_INFO,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_DEBUG,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_VERBOSE,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_OFF,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_FATAL,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_ERROR,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_WARN,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_INFO,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_DEBUG,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_VERBOSE,
+                                         DLT_TRACE_STATUS_ON));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_register_context_ll_ts, abnormal)
@@ -2468,50 +2548,61 @@ TEST(t_dlt_register_context_ll_ts, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "", "d", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "T", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1", "1", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1234567890", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1234567890", "1", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-
-    // DLT_LOG_DEFAULT and DLT_TRACE_STATUS_DEFAULT not allowed
-    // TODO: Why not?
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEFAULT, DLT_TRACE_STATUS_OFF));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEFAULT, DLT_TRACE_STATUS_DEFAULT));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-//    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_DEFAULT));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-
-    // abnormal values for loglevel and tracestatus
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", -3, DLT_TRACE_STATUS_OFF));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", 100, DLT_TRACE_STATUS_OFF));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, -3));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, 100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context_ll_ts(&context, "", "d", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "T", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context_ll_ts(&context, "", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1", "1", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1234567890", "", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST1234567890", "1", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_OFF,
+                                         DLT_TRACE_STATUS_ON));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_ON)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+
+    /* DLT_LOG_DEFAULT and DLT_TRACE_STATUS_DEFAULT not allowed */
+    /* TODO: Why not? */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEFAULT, DLT_TRACE_STATUS_OFF)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_DEFAULT, DLT_TRACE_STATUS_DEFAULT)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+/*    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_DEFAULT)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+
+    /* abnormal values for loglevel and tracestatus */
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", -3,
+                                         DLT_TRACE_STATUS_OFF));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal", 100,
+                                         DLT_TRACE_STATUS_OFF));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_OFF, -3));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER,
+              dlt_register_context_ll_ts(&context, "TEST", "dlt_user.c t_dlt_register_context_ll_ts normal",
+                                         DLT_LOG_OFF, 100));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, "TEST", NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF)); */
+
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_register_context_ll_ts, nullpointer)
@@ -2520,31 +2611,35 @@ TEST(t_dlt_register_context_ll_ts, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, NULL, "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(&context, NULL, NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(NULL, "TEST", NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(NULL, NULL, "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context_ll_ts(NULL, NULL, NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_register_context_ll_ts(&context, NULL, "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context_ll_ts(&context, NULL, NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context_ll_ts(NULL, "TEST", NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
+    EXPECT_GE(DLT_RETURN_ERROR,
+              dlt_register_context_ll_ts(NULL, NULL, "dlt_user.c t_dlt_register_context_ll_ts normal", DLT_LOG_OFF,
+                                         DLT_TRACE_STATUS_OFF));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context_ll_ts(NULL, NULL, NULL, DLT_LOG_OFF, DLT_TRACE_STATUS_OFF));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
-/////////////////////////////////////////
-// t_dlt_unregister_context
+/*/////////////////////////////////////// */
+/* t_dlt_unregister_context */
 TEST(t_dlt_unregister_context, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_unregister_context, abnormal)
@@ -2553,31 +2648,31 @@ TEST(t_dlt_unregister_context, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "", "d"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "T", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "1"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", ""));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "1"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, "", "d"));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "T", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, "", ""));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1", "1")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_unregister_context(&context)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST1234567890", "1")); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", NULL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal"));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_unregister_context normal")); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, "TEST", NULL)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_unregister_context, nullpointer)
@@ -2586,20 +2681,20 @@ TEST(t_dlt_unregister_context, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
 
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, NULL, "dlt_user.c t_dlt_unregister_context normal"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(&context, NULL, NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, "TEST", NULL));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, NULL, "dlt_user.c t_dlt_unregister_context normal"));
-    EXPECT_GE(DLT_RETURN_ERROR,dlt_register_context(NULL, NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, NULL, "dlt_user.c t_dlt_unregister_context normal"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(&context, NULL, NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, "TEST", NULL));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, NULL, "dlt_user.c t_dlt_unregister_context normal"));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_register_context(NULL, NULL, NULL));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 
-/////////////////////////////////////////
-// t_dlt_register_injection_callback
+/*/////////////////////////////////////// */
+/* t_dlt_register_injection_callback */
 int dlt_user_injection_callback(uint32_t /*service_id*/, void */*data*/, uint32_t /*length*/)
 {
     return 0;
@@ -2608,28 +2703,28 @@ int dlt_user_injection_callback(uint32_t /*service_id*/, void */*data*/, uint32_
 TEST(t_dlt_register_injection_callback, normal)
 {
     DltContext context;
-    // TODO: uint32_t service_id;
+    /* TODO: uint32_t service_id; */
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_injection_callback normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_injection_callback normal"));
 
-    // TODO: service_id = 0x123;
-    // TODO: EXPECT_LE(DLT_RETURN_OK,dlt_register_injection_callback(&context, service_id, dlt_user_injection_callback));
+    /* TODO: service_id = 0x123; */
+    /* TODO: EXPECT_LE(DLT_RETURN_OK,dlt_register_injection_callback(&context, service_id, dlt_user_injection_callback)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 
 }
 
 
-/////////////////////////////////////////
-// t_dlt_register_log_level_changed_callback
-void dlt_user_log_level_changed_callback(char /*context_id*/[DLT_ID_SIZE], uint8_t /*log_level*/, uint8_t /*trace_status*/)
-{
-
-}
+/*/////////////////////////////////////// */
+/* t_dlt_register_log_level_changed_callback */
+void dlt_user_log_level_changed_callback(char /*context_id*/[DLT_ID_SIZE], uint8_t /*log_level*/,
+                                         uint8_t /*trace_status*/)
+{}
 
 TEST(t_dlt_register_log_level_changed_callback, normal)
 {
@@ -2637,46 +2732,46 @@ TEST(t_dlt_register_log_level_changed_callback, normal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_log_level_changed_callback normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_register_log_level_changed_callback normal"));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_log_level_changed_callback(&context, dlt_user_log_level_changed_callback));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_log_level_changed_callback(&context, dlt_user_log_level_changed_callback));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 
 }
 
 
-/////////////////////////////////////////
-// t_dlt_user_trace_network
+/*/////////////////////////////////////// */
+/* t_dlt_user_trace_network */
 TEST(t_dlt_user_trace_network, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network normal"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
+
+    for (char i = 0; i < 16; ++i)
         header[(int)i] = i;
-    }
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network, abnormal)
@@ -2685,33 +2780,33 @@ TEST(t_dlt_user_trace_network, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network abnormal"));
 
-    // TODO: char header[16];
-    // TODO: for(char i = 0; i < 16; ++i)
-    // TODO: {
-    // TODO:     header[(int)i] = i;
-    // TODO: }
-    // TODO: char payload[32];
-    // TODO: for(char i = 0; i < 32; ++i)
-    // TODO: {
-    // TODO:     payload[(int)i] = i;
-    // TODO: }
+    /* TODO: char header[16]; */
+    /* TODO: for(char i = 0; i < 16; ++i) */
+    /* TODO: { */
+    /* TODO:     header[(int)i] = i; */
+    /* TODO: } */
+    /* TODO: char payload[32]; */
+    /* TODO: for(char i = 0; i < 32; ++i) */
+    /* TODO: { */
+    /* TODO:     payload[(int)i] = i; */
+    /* TODO: } */
 
-    // data length = 0. Does this make sense?
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload));
+    /* data length = 0. Does this make sense? */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload)); */
 
-    // invalid DltNetworkTraceType value
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)-100, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)-10, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)10, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)100, 16, header, 32, payload));
+    /* invalid DltNetworkTraceType value */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)-100, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)-10, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)10, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network(&context, (DltNetworkTraceType)100, 16, header, 32, payload)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network, nullpointer)
@@ -2720,59 +2815,60 @@ TEST(t_dlt_user_trace_network, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network nullpointer"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
+
+    for (char i = 0; i < 16; ++i)
         header[(int)i] = i;
-    }
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    // what to expect when giving in NULL pointer?
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL));
+    /* what to expect when giving in NULL pointer? */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_trace_network(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_trace_network(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 
-/////////////////////////////////////////
-// t_dlt_user_trace_network_truncated
+/*/////////////////////////////////////// */
+/* t_dlt_user_trace_network_truncated */
 TEST(t_dlt_user_trace_network_truncated, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated normal"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
+
+    for (char i = 0; i < 16; ++i)
         header[(int)i] = i;
-    }
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload, 0));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload, 1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload, -1));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload, 10));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload, 0));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload, 1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload, -1));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload, 10));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network_truncated, abnormal)
@@ -2781,33 +2877,34 @@ TEST(t_dlt_user_trace_network_truncated, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated abnormal"));
 
-    // TODO: char header[16];
-    // TODO: for(char i = 0; i < 16; ++i)
-    // TODO: {
-    // TODO:     header[(int)i] = i;
-    // TODO: }
-    // TODO: char payload[32];
-    // TODO: for(char i = 0; i < 32; ++i)
-    // TODO: {
-    // TODO:     payload[(int)i] = i;
-    // TODO: }
+    /* TODO: char header[16]; */
+    /* TODO: for(char i = 0; i < 16; ++i) */
+    /* TODO: { */
+    /* TODO:     header[(int)i] = i; */
+    /* TODO: } */
+    /* TODO: char payload[32]; */
+    /* TODO: for(char i = 0; i < 32; ++i) */
+    /* TODO: { */
+    /* TODO:     payload[(int)i] = i; */
+    /* TODO: } */
 
-    // data length = 0. Does this make sense?
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload, 0));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload, 0));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload, 0));
+    /* data length = 0. Does this make sense? */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload, 0)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload, 0)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload, 0)); */
 
-    // invalid DltNetworkTraceType value
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)-100, 16, header, 32, payload, 0));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)-10, 16, header, 32, payload, 0));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)10, 16, header, 32, payload, 0));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)100, 16, header, 32, payload, 0));
+    /* invalid DltNetworkTraceType value */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)-100, 16, header, 32, payload, 0)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)-10, 16, header, 32, payload, 0)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)10, 16, header, 32, payload, 0)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_truncated(&context, (DltNetworkTraceType)100, 16, header, 32, payload, 0)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network_truncated, nullpointer)
@@ -2816,59 +2913,61 @@ TEST(t_dlt_user_trace_network_truncated, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_truncated nullpointer"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
+
+    for (char i = 0; i < 16; ++i)
         header[(int)i] = i;
-    }
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    // what to expect when giving in NULL pointer?
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload, 0));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL, 0));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL, 0));
+    /* what to expect when giving in NULL pointer? */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload, 0));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,
+              dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL, 0));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,
+              dlt_user_trace_network_truncated(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL, 0));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 
-/////////////////////////////////////////
-// t_dlt_user_trace_network_segmented
+/*/////////////////////////////////////// */
+/* t_dlt_user_trace_network_segmented */
 TEST(t_dlt_user_trace_network_segmented, normal)
 {
     DltContext context;
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented normal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented normal"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
+
+    for (char i = 0; i < 16; ++i)
         header[(int)i] = i;
-    }
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload));
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 32, payload));
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_MOST, 16, header, 32, payload));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network_segmented, abnormal)
@@ -2877,33 +2976,34 @@ TEST(t_dlt_user_trace_network_segmented, abnormal)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented abnormal"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented abnormal"));
 
-    // TODO: char header[16];
-    // TODO: for(char i = 0; i < 16; ++i)
-    // TODO: {
-    // TODO:     header[(int)i] = i;
-    // TODO: }
-    // TODO: char payload[32];
-    // TODO: for(char i = 0; i < 32; ++i)
-    // TODO: {
-    // TODO:     payload[(int)i] = i;
-    // TODO: }
+    /* TODO: char header[16]; */
+    /* TODO: for(char i = 0; i < 16; ++i) */
+    /* TODO: { */
+    /* TODO:     header[(int)i] = i; */
+    /* TODO: } */
+    /* TODO: char payload[32]; */
+    /* TODO: for(char i = 0; i < 32; ++i) */
+    /* TODO: { */
+    /* TODO:     payload[(int)i] = i; */
+    /* TODO: } */
 
-    // data length = 0. Does this make sense?
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload));
+    /* data length = 0. Does this make sense? */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 0, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 0, header, 0, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, header, 0, payload)); */
 
-    // invalid DltNetworkTraceType value
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)-100, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)-10, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)10, 16, header, 32, payload));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)100, 16, header, 32, payload));
+    /* invalid DltNetworkTraceType value */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)-100, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)-10, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)10, 16, header, 32, payload)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_user_trace_network_segmented(&context, (DltNetworkTraceType)100, 16, header, 32, payload)); */
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_trace_network_segmented, nullpointer)
@@ -2912,41 +3012,43 @@ TEST(t_dlt_user_trace_network_segmented, nullpointer)
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented nullpointer"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK,
+              dlt_register_context(&context, "TEST", "dlt_user.c t_dlt_user_trace_network_segmented nullpointer"));
 
     char header[16];
-    for(char i = 0; i < 16; ++i)
-    {
-    header[(int)i] = i;
-    }
+
+    for (char i = 0; i < 16; ++i)
+        header[(int)i] = i;
+
     char payload[32];
-    for(char i = 0; i < 32; ++i)
-    {
+
+    for (char i = 0; i < 32; ++i)
         payload[(int)i] = i;
-    }
 
-    // what to expect when giving in NULL pointer?
-    EXPECT_LE(DLT_RETURN_OK,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL));
-    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL));
+    /* what to expect when giving in NULL pointer? */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_IPC, 16, NULL, 32, payload));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,
+              dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_CAN, 16, header, 32, NULL));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER,
+              dlt_user_trace_network_segmented(&context, DLT_NW_TRACE_FLEXRAY, 16, NULL, 32, NULL));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 
-/////////////////////////////////////////
-// t_dlt_set_log_mode
+/*/////////////////////////////////////// */
+/* t_dlt_set_log_mode */
 TEST(t_dlt_set_log_mode, normal)
 {
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_set_log_mode(DLT_USER_MODE_OFF));
-    EXPECT_LE(DLT_RETURN_OK,dlt_set_log_mode(DLT_USER_MODE_EXTERNAL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_set_log_mode(DLT_USER_MODE_INTERNAL));
-    EXPECT_LE(DLT_RETURN_OK,dlt_set_log_mode(DLT_USER_MODE_BOTH));
+    EXPECT_LE(DLT_RETURN_OK, dlt_set_log_mode(DLT_USER_MODE_OFF));
+    EXPECT_LE(DLT_RETURN_OK, dlt_set_log_mode(DLT_USER_MODE_EXTERNAL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_set_log_mode(DLT_USER_MODE_INTERNAL));
+    EXPECT_LE(DLT_RETURN_OK, dlt_set_log_mode(DLT_USER_MODE_BOTH));
 
 }
 
@@ -2955,68 +3057,68 @@ TEST(t_dlt_set_log_mode, abnormal)
 
 
 
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode(DLT_USER_MODE_UNDEFINED));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)-100));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)-10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)10));
-    // TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)100));
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode(DLT_USER_MODE_UNDEFINED)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)-100)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)-10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)10)); */
+    /* TODO: EXPECT_GE(DLT_RETURN_ERROR,dlt_set_log_mode((DltUserLogMode)100)); */
 
 }
 
 
-/////////////////////////////////////////
-// t_dlt_get_log_state
+/*/////////////////////////////////////// */
+/* t_dlt_get_log_state */
 TEST(t_dlt_get_log_state, normal)
 {
 
 
     sleep(1);
     dlt_init_common();
-    EXPECT_EQ(-1,dlt_get_log_state());
+    EXPECT_EQ(-1, dlt_get_log_state());
 
 }
 
 
-/////////////////////////////////////////
-// t_dlt_verbose_mode
+/*/////////////////////////////////////// */
+/* t_dlt_verbose_mode */
 TEST(t_dlt_verbose_mode, normal)
 {
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_verbose_mode());
+    EXPECT_LE(DLT_RETURN_OK, dlt_verbose_mode());
 
 }
 
 
-/////////////////////////////////////////
-// t_dlt_nonverbose_mode
+/*/////////////////////////////////////// */
+/* t_dlt_nonverbose_mode */
 TEST(t_dlt_nonverbose_mode, normal)
 {
 
 
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_nonverbose_mode());
+    EXPECT_LE(DLT_RETURN_OK, dlt_nonverbose_mode());
 
 }
 
-/////////////////////////////////////////
-// free dlt
+/*/////////////////////////////////////// */
+/* free dlt */
 TEST(t_dlt_free, onetime)
 {
     EXPECT_EQ(DLT_RETURN_OK, dlt_free());
 }
 
-/////////////////////////////////////////
-// dlt_user_is_logLevel_enabled
+/*/////////////////////////////////////// */
+/* dlt_user_is_logLevel_enabled */
 TEST(t_dlt_user_is_logLevel_enabled, normal)
 {
     DltContext context;
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_app("TUSR", "dlt_user.c tests"));
-    EXPECT_LE(DLT_RETURN_OK,dlt_register_context_ll_ts(&context, "ILLE",
-                               "t_dlt_user_is_logLevel_enabled context",
-                               DLT_LOG_INFO,
-                               -2)); /* DLT_USER_TRACE_STATUS_NOT_SET */
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_app("TUSR", "dlt_user.c tests"));
+    EXPECT_LE(DLT_RETURN_OK, dlt_register_context_ll_ts(&context, "ILLE",
+                                                        "t_dlt_user_is_logLevel_enabled context",
+                                                        DLT_LOG_INFO,
+                                                        -2)); /* DLT_USER_TRACE_STATUS_NOT_SET */
 
     EXPECT_LE(DLT_RETURN_TRUE, dlt_user_is_logLevel_enabled(&context, DLT_LOG_FATAL));
     EXPECT_LE(DLT_RETURN_TRUE, dlt_user_is_logLevel_enabled(&context, DLT_LOG_ERROR));
@@ -3026,8 +3128,8 @@ TEST(t_dlt_user_is_logLevel_enabled, normal)
     EXPECT_LE(DLT_RETURN_LOGGING_DISABLED, dlt_user_is_logLevel_enabled(&context, DLT_LOG_VERBOSE));
     EXPECT_LE(DLT_RETURN_LOGGING_DISABLED, dlt_user_is_logLevel_enabled(&context, DLT_LOG_OFF));
 
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_context(&context));
-    EXPECT_LE(DLT_RETURN_OK,dlt_unregister_app());
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
+    EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
 }
 
 TEST(t_dlt_user_is_logLevel_enabled, nullpointer)
@@ -3035,8 +3137,8 @@ TEST(t_dlt_user_is_logLevel_enabled, nullpointer)
     EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_is_logLevel_enabled(NULL, DLT_LOG_FATAL));
 }
 
-/////////////////////////////////////////
-// main
+/*/////////////////////////////////////// */
+/* main */
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/mod_system_logger/mod_system_logger.c b/tests/mod_system_logger/mod_system_logger.c
index 1d31fdb..61c732c 100644
--- a/tests/mod_system_logger/mod_system_logger.c
+++ b/tests/mod_system_logger/mod_system_logger.c
@@ -4,31 +4,36 @@
 
 int i;
 
-static int system_proc_show(struct seq_file *m, void *v) {
-  for(i=0; i<1000; i++)
-    seq_printf(m, "Test Systemlogger %i\n",i);
-  return 0;
+static int system_proc_show(struct seq_file *m, void *v)
+{
+    for (i = 0; i < 1000; i++)
+        seq_printf(m, "Test Systemlogger %i\n", i);
+
+    return 0;
 }
 
-static int system_proc_open(struct inode *inode, struct  file *file) {
-  return single_open(file, system_proc_show, NULL);
+static int system_proc_open(struct inode *inode, struct  file *file)
+{
+    return single_open(file, system_proc_show, NULL);
 }
 
 static const struct file_operations system_proc_fops = {
-  .owner = THIS_MODULE,
-  .open = system_proc_open,
-  .read = seq_read,
-  .llseek = seq_lseek,
-  .release = single_release,
+    .owner = THIS_MODULE,
+    .open = system_proc_open,
+    .read = seq_read,
+    .llseek = seq_lseek,
+    .release = single_release,
 };
 
-static int __init system_proc_init(void) {
-  proc_create("systemlogger", 0, NULL, &system_proc_fops);
-  return 0;
+static int __init system_proc_init(void)
+{
+    proc_create("systemlogger", 0, NULL, &system_proc_fops);
+    return 0;
 }
 
-static void __exit system_proc_exit(void) {
-  remove_proc_entry("systemlogger", NULL);
+static void __exit system_proc_exit(void)
+{
+    remove_proc_entry("systemlogger", NULL);
 }
 
 MODULE_LICENSE("GPL");
author	Christoph Lipka <clipka@de.adit-jv.com>	2018-12-20 14:58:19 +0100
committer	Christoph Lipka <clipka@de.adit-jv.com>	2018-12-21 10:23:41 +0100
commit	dca8ab254aa0a687c32009079d85e4d8f960b213 (patch)
tree	e63b6a552fd9f61873892110a56a89ef354864cd /tests
parent	0d0c74640c8b792db37cb9f884f89f7561ea551f (diff)
download	DLT-daemon-dca8ab254aa0a687c32009079d85e4d8f960b213.tar.gz