Changeset 2193905 for lib/format_linux_common.c

Timestamp:

11/29/18 10:12:59 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

fdf23b8

Parents:

d74ca03

Message:

Apply changes required for pull request #81

File:

• lib/format_linux_common.c (modified) (4 diffs)

lib/format_linux_common.c

@@ -40 +40 @@
 #include <unistd.h>
 #include <string.h>
-#include <assert.h>
 
 #ifdef HAVE_INTTYPES_H
@@ -186 +185 @@
                 malloc(sizeof(struct linux_format_data_t));
 
-        /*assert(libtrace->format_data != NULL);*/
         if (!libtrace->format_data) {
-                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory linuxcommon_init_input()");
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside linuxcommon_init_input()");
                 return -1;
         }
@@ -195 +194 @@
                 libtrace_list_init(sizeof(stream_data));
 
-        /*assert(FORMAT_DATA->per_stream != NULL);*/
         if (!FORMAT_DATA->per_stream) {
                 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to create list for stream data linuxcommon_init_input()");
@@ -222 +220 @@
                 malloc(sizeof(struct linux_format_data_out_t));
 
-        /*assert(libtrace->format_data != NULL);*/
         if (!libtrace->format_data) {
-                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory linuxcommon_init_output()");
+                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside linuxcommon_init_output()");
                 return -1;
         }