Changeset dad224b for lib/format_helper.c

Timestamp:

03/21/14 16:29:56 (8 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

29bbef0, d1af45d

Parents:

1ca603b (diff), 74ecbc7 (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 'nicercompressionoptions' into develop

File:

• lib/format_helper.c (modified) (1 diff)

lib/format_helper.c

@@ -263 +263 @@
 {
         iow_t *io = NULL;
-        assert(level<10);
-        assert(level>=0);
+
+        if (level < 0 || level > 9) {
+                trace_set_err_out(trace, TRACE_ERR_UNSUPPORTED_COMPRESS, 
+                                "Compression level %d is invalid, must be between 0 and 9 inclusive", 
+                                level);
+                return NULL;
+        }
+
+        if (compress_type < 0 || 
+                        compress_type >= TRACE_OPTION_COMPRESSTYPE_LAST) {
+                trace_set_err_out(trace, TRACE_ERR_UNSUPPORTED_COMPRESS,
+                                "Invalid compression type %d", compress_type);
+                return NULL;
+        }
 
         io = wandio_wcreate(trace->uridata, compress_type, level, fileflag);