Changeset 2193905 for lib/format_erf.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_erf.c (modified) (11 diffs)

lib/format_erf.c

@@ -35 +35 @@
 #include "wandio.h"
 
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -180 +179 @@
                         exthdr ++;
                         firstbyte = (uint8_t *)exthdr;
-                        /*assert(extsize <= ntohs(erfptr->rlen));*/
                         if (extsize > ntohs(erfptr->rlen)) {
                                 trace_set_err(packet->trace, TRACE_ERR_BAD_PACKET, "Extension size is greater than dag record record length in erf_get_framing_length()");
@@ -233 +231 @@
 
         if (!libtrace->format_data) {
-                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory erf_init_input()");
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside erf_init_input()");
                 return -1;
         }
@@ -388 +387 @@
                         break;
                 case INDEX_UNKNOWN:
-                        /*assert(0);*/
                         trace_set_err(libtrace, TRACE_ERR_SEEK_ERF, "Cannot seek to erf timestamp with unknown index in erf_seek_erf()");
                         return -1;
@@ -412 +410 @@
 
         if (!libtrace->format_data) {
-                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory erf_init_output()");
+                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside erf_init_output()");
                 return -1;
         }
@@ -475 +474 @@
         } else
                 packet->buf_control = TRACE_CTRL_EXTERNAL;
-        
-        
+
         packet->type = rt_type;
         packet->buffer = buffer;
@@ -487 +485 @@
         }
 
-        /*assert(erfptr->rlen != 0);*/
         if (erfptr->rlen == 0) {
-                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Packet is empty in erf_prepare_packet()\n");
+                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "ERF packet has an invalid record "
+                        "length: zero, in erf_prepare_packet()\n");
                 return -1;
         }
@@ -668 +666 @@
         void *payload = packet->payload;
 
-        /*assert(OUTPUT->file);*/
         if (!OUTPUT->file) {
-                trace_set_err_out(libtrace, TRACE_ERR_BAD_IO, "Call init_output before write_packet() in erf_write_packet()");
+                trace_set_err_out(libtrace, TRACE_ERR_BAD_IO, "Attempted to write ERF packets to a "
+                        "closed file, must call trace_create_output() before calling trace_write_output()");
                 return -1;
         }
@@ -722 +720 @@
 
                 /* Packet length (rlen includes format overhead) */
-                /*assert(trace_get_capture_length(packet)>0
-                                && trace_get_capture_length(packet)<=65536);*/
-                if (!(trace_get_capture_length(packet) > 0
-                        && trace_get_capture_length(packet) <= 65536)) {
+                if (trace_get_capture_length(packet) <= 0
+                        || trace_get_capture_length(packet) > 65536) {
                         trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture length is out of range in erf_write_packet()");
                         return -1;
                 }
-                /*assert(trace_get_framing_length(packet)<=65536);*/
                 if (trace_get_framing_length(packet) > 65536) {
                         trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
@@ -743 +738 @@
 
                 rlen = trace_get_capture_length(packet) + framing;
-                /*assert(rlen > 0 && rlen <= 65536);*/
-                if (!(rlen > 0 && rlen <= 65536)) {
+                if (rlen <= 0 || rlen > 65536) {
                         trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture + framing length is out of range in erf_write_packet()");
@@ -836 +830 @@
         uint16_t wlen;
 
-        /*assert(packet);*/
         if (!packet) {
                 fprintf(stderr, "NULL packet passed to erf_set_capture_length()\n");