Changeset 2193905 for lib/combiner_sorted.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/combiner_sorted.c (modified) (2 diffs)

lib/combiner_sorted.c

@@ -34 +34 @@
 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) {
         int i = 0;
-        /*assert(trace_get_perpkt_threads(t) > 0);*/
         if (trace_get_perpkt_threads(t) <= 0) {
                 trace_set_err(t, TRACE_ERR_INIT_FAILED, "You must have atleast 1 processing thread");
@@ -109 +108 @@
 
         for (i = 0; i < trace_get_perpkt_threads(trace); i++) {
-                /*assert(libtrace_vector_get_size(&queues[i]) == 0);*/
                 if (libtrace_vector_get_size(&queues[i]) != 0) {
                         trace_set_err(trace, TRACE_ERR_COMBINER,
-                                "Failed to destory queues, A thread still has data in destroy()");
+                                "Failed to destroy queues, A thread still has data in destroy()");
                         return;
                 }