Changeset d7d3267 for lib/format_helper.c

Timestamp:

11/29/18 13:37:20 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

50e9c6b

Parents:

54642da (diff), fdf23b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://github.com/jacobvw/libtrace into jacobvw-master

Conflicts:

lib/format_linux_ring.c

File:

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

lib/format_helper.c

@@ -39 +39 @@
 #include "format_helper.h"
 
-#include <assert.h>
 #include <stdarg.h>
 
@@ -69 +68 @@
         struct timeval tv;
 
-        assert(trace != NULL);
-        assert(packet != NULL);
-        
+        if (!trace) {
+                fprintf(stderr, "NULL trace passed into trace_event_device()\n");
+                event.type = TRACE_EVENT_TERMINATE;
+                return event;
+        }
+        if (!packet) {
+                trace_set_err(trace, TRACE_ERR_NULL_PACKET, "NULL packet passed into trace_event_device()");
+                event.type = TRACE_EVENT_TERMINATE;
+                return event;
+        }
+
         FD_ZERO(&rfds);
         FD_ZERO(&rfds_param);
@@ -292 +299 @@
         va_list va;
         va_start(va,msg);
-        assert(errcode != 0 && "An error occurred, but it is unknown what it is");
+
+        if (errcode == 0) {
+                fprintf(stderr, "An error occurred, but it is unknown what it is");
+                return;
+        }
+
         trace->err.err_num=errcode;
         if (errcode>0) {
@@ -315 +327 @@
         va_list va;
         va_start(va,msg);
-        assert(errcode != 0 && "An error occurred, but it is unknown what it is");
+        if (errcode == 0) {
+                fprintf(stderr, "An error occurred, but is is unknown what is is");
+                return;
+        }
         trace->err.err_num=errcode;
         if (errcode>0) {