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

lib/data-struct/linked_list.c

@@ -26 +26 @@
 #include "linked_list.h"
 
-#include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -72 +71 @@
         /* Create the new node */
         new = (libtrace_list_node_t *)malloc(sizeof(libtrace_list_node_t));
-        /*assert(new != NULL);*/
         if (!new) {
                 fprintf(stderr, "Unable to allocate memory for node in libtrace_list_push_front()\n");
@@ -78 +76 @@
         }
         new->data = malloc(l->element_size);
-        /*assert(new->data != NULL);*/
         if (!new->data) {
                 fprintf(stderr, "Unable to allocate memory for node data in libtrace_list_push_front()\n");
@@ -87 +84 @@
 
         if (l->head == NULL) {
-                /*assert(l->tail == NULL && l->size == 0);*/
-                if (l->tail != NULL && l->size != 0) {
+                if (l->tail != NULL || l->size != 0) {
                         fprintf(stderr, "Error cannot have a NULL head with a non NULL tail and a size of non 0 in libtrace_list_push_front()\n");
                         return;
@@ -111 +107 @@
         /* Create the new node */
         new = (libtrace_list_node_t *)malloc(sizeof(libtrace_list_node_t));
-        /*assert(new != NULL);*/
         if (!new) {
                 fprintf(stderr, "Unable to allocate memory for node in libtrace_list_push_back()\n");
@@ -117 +112 @@
         }
         new->data = malloc(l->element_size);
-        /*assert(new->data != NULL);*/
         if (!new->data) {
                 fprintf(stderr, "Unable to allocate memory for node data in libtrace_list_push_back()\n");
@@ -126 +120 @@
 
         if (l->tail == NULL) {
-                /*assert(l->head == NULL && l->size == 0);*/
-                if (l->head != NULL && l->size != 0) {
+                if (l->head != NULL || l->size != 0) {
                         fprintf(stderr, "Error cannot have a NULL tail with a non NULL head and a size of non 0 in libtrace_list_push_back()\n");
                         return;
@@ -219 +212 @@
         while (index--) {
                 ret = ret->next;
-                /*assert(ret != NULL);*/
                 if (!ret) {
                         fprintf(stderr, "Error encountered NULL index in libtrace_list_get_index()\n");