Changeset 2193905 for lib/data-struct/buckets.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/data-struct/buckets.c (modified) (5 diffs)

lib/data-struct/buckets.c

@@ -26 +26 @@
 
 #include <stdlib.h>
-#include <assert.h>
 #include <string.h>
 #include "buckets.h"
@@ -183 +182 @@
         libtrace_bucket_node_t tmp;
 
-        /*assert(id != 0);*/
         if (id == 0) {
                 fprintf(stderr, "bucket ID cannot be 0 in libtrace_release_bucket_id()\n");
@@ -191 +189 @@
         pthread_mutex_lock(&b->lock);
         bnode = b->packets[id];
-        /*assert(bnode != NULL);*/
-        if (bnode == NULL) {
+        if (!bnode) {
                 fprintf(stderr, "bucket ID %lu is NULL in libtrace_release_bucket_id()\n", id);
                 return;
@@ -204 +201 @@
                 s = id - bnode->startindex;
         }
-        /*assert(s < bnode->slots);*/
         if (s >= bnode->slots) {
                 fprintf(stderr, "Error in libtrace_release_bucket_id()\n");
                 return;
         }
-        /*assert(bnode->released[s] != 0);*/
         if (bnode->released[s] == 0) {
                 fprintf(stderr, "Error in libtrace_release_bucket_id()\n");
@@ -244 +239 @@
                         break;
 
-                /*assert(lnode->next != NULL);*/
-                if (lnode->next == NULL) {
+                if (!lnode->next) {
                         fprintf(stderr, "Error in libtrace_release_bucket_id()\n");
                         return;