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

lib/data-struct/deque.c

@@ -63 +63 @@
         ASSERT_RET(pthread_mutex_lock(&q->lock), == 0);
         if (q->head == NULL) {
-                /*assert(q->tail == NULL && q->size == 0);*/
-                if (q->tail != NULL && q->size != 0) {
+                if (q->tail != NULL || q->size != 0) {
                         fprintf(stderr, "Error deque head cannot be NULL with a non NULL tail and size of more than 0 in libtrace_deque_push_back()\n");
                         return;
@@ -71 +70 @@
                 q->head = q->tail = new_node;
         } else {
-                /*assert (q->tail != NULL);*/
                 if (q->tail == NULL) {
                         fprintf(stderr, "Error deque tail cannot be NULL if it contains a head in libtrace_deque_push_back()\n");
@@ -94 +92 @@
         ASSERT_RET(pthread_mutex_lock(&q->lock), == 0);
         if (q->head == NULL) {
-                /*assert(q->tail == NULL && q->size == 0);*/
-                if (q->tail != NULL && q->size != 0) {
+                if (q->tail != NULL || q->size != 0) {
                         fprintf(stderr, "Error deque head cannot be NULL with a non NULL tail and size of more than 0 in libtrace_deque_push_front()\n");
                         return;
@@ -102 +99 @@
                 q->head = q->tail = new_node;
         } else {
-                /*assert (q->head != NULL);*/
-                if (q->head == NULL) {
-                        fprintf(stderr, "Error deque tail cannot be NULL if it contains a head in libtrace_deque_push_front()\n");
-                        return;
-                }
                 q->head->prev = new_node;
                 new_node->next = q->head; // Done the double link