Changeset 8c5c550

Timestamp:

12/10/18 16:09:46 (23 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

ccabd47

Parents:

10fd24b

Message:

Fix build errors introduced recently in format_dag25.c

File:

• lib/format_dag25.c (modified) (5 diffs)

lib/format_dag25.c

@@ -247 +247 @@
                 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
                         "Unable to create list for stream in dag_init_format_data()");
-                return -1;
+                return;
         }
 
@@ -622 +622 @@
                  * the user to configure this correctly. */
                 return 0;
-        }
         case TRACE_OPTION_CONSTANT_ERF_FRAMING:
                 return -1;
+        }
         return -1;
 }
@@ -1240 +1240 @@
                 if (trace_get_capture_length(packet) <= 0
                        || trace_get_capture_length(packet) > 65536) {
-                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
+                        trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture length is out of range in dag_write_packet()");
                         return -1;
@@ -1246 +1246 @@
                 if (erf_get_framing_length(packet) <= 0
                        || trace_get_framing_length(packet) > 65536) {
-                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
+                        trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Framing length is out of range in dag_write_packet()");
                         return -1;
@@ -1254 +1254 @@
                        || trace_get_capture_length(packet) +
                        erf_get_framing_length(packet) > 65536) {
-                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET,
+                        trace_set_err_out(libtrace, TRACE_ERR_BAD_PACKET,
                                 "Capture + framing length is out of range in dag_write_packet()");
                         return -1;