skiplist: follow up to r1664769.

Fix insert_compare() returning NULL on the very first insertion (top is NULL).

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1672354 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 44 insertions, 44 deletions

diff --git a/test/testskiplist.c b/test/testskiplist.c
index 91a4403df..f342abf4f 100644
--- a/test/testskiplist.c
+++ b/test/testskiplist.c
@@ -58,7 +58,7 @@ static void skiplist_find(abts_case *tc, void *data)
 {
     const char *val;
 
-    apr_skiplist_insert(skiplist, "baton");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "baton"));
     val = apr_skiplist_find(skiplist, "baton", NULL);
     ABTS_PTR_NOTNULL(tc, val);
     ABTS_STR_EQUAL(tc, "baton", val);
@@ -78,7 +78,7 @@ static void skiplist_insert(abts_case *tc, void *data)
     int i, height = 0;
 
     for (i = 0; i < 10; ++i) {
-        apr_skiplist_insert(skiplist, "baton");
+        ABTS_PTR_EQUAL(tc, NULL, apr_skiplist_insert(skiplist, "baton"));
         ABTS_TRUE(tc, 1 == skiplist_get_size(tc, skiplist));
         val = apr_skiplist_find(skiplist, "baton", NULL);
         ABTS_PTR_NOTNULL(tc, val);
@@ -92,13 +92,13 @@ static void skiplist_insert(abts_case *tc, void *data)
         }
     }
 
-    apr_skiplist_insert(skiplist, "foo");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "foo"));
     ABTS_TRUE(tc, 2 == skiplist_get_size(tc, skiplist));
     val = apr_skiplist_find(skiplist, "foo", NULL);
     ABTS_PTR_NOTNULL(tc, val);
     ABTS_STR_EQUAL(tc, "foo", val);
 
-    apr_skiplist_insert(skiplist, "atfirst");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "atfirst"));
     ABTS_TRUE(tc, 3 == skiplist_get_size(tc, skiplist));
     val = apr_skiplist_find(skiplist, "atfirst", NULL);
     ABTS_PTR_NOTNULL(tc, val);
@@ -116,28 +116,28 @@ static void skiplist_add(abts_case *tc, void *data)
 
     for (i = 0; i < NUM_ADDS; ++i) {
         n++;
-        apr_skiplist_add(skiplist, "daton");
+        ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "daton"));
         ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist));
         val = apr_skiplist_find(skiplist, "daton", NULL);
         ABTS_PTR_NOTNULL(tc, val);
         ABTS_STR_EQUAL(tc, "daton", val);
 
         n++;
-        apr_skiplist_add(skiplist, "baton");
+        ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "baton"));
         ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist));
         val = apr_skiplist_find(skiplist, "baton", NULL);
         ABTS_PTR_NOTNULL(tc, val);
         ABTS_STR_EQUAL(tc, "baton", val);
 
         n++;
-        apr_skiplist_add(skiplist, "caton");
+        ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "caton"));
         ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist));
         val = apr_skiplist_find(skiplist, "caton", NULL);
         ABTS_PTR_NOTNULL(tc, val);
         ABTS_STR_EQUAL(tc, "caton", val);
 
         n++;
-        apr_skiplist_add(skiplist, "aaton");
+        ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "aaton"));
         ABTS_TRUE(tc, n == skiplist_get_size(tc, skiplist));
         val = apr_skiplist_find(skiplist, "aaton", NULL);
         ABTS_PTR_NOTNULL(tc, val);
@@ -195,9 +195,9 @@ static void skiplist_size(abts_case *tc, void *data)
 
     ABTS_TRUE(tc, 0 == skiplist_get_size(tc, skiplist));
 
-    apr_skiplist_insert(skiplist, "abc");
-    apr_skiplist_insert(skiplist, "ghi");
-    apr_skiplist_insert(skiplist, "def");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "abc"));
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "ghi"));
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(skiplist, "def"));
     val = apr_skiplist_find(skiplist, "abc", NULL);
     ABTS_PTR_NOTNULL(tc, val);
     ABTS_STR_EQUAL(tc, "abc", val);
@@ -218,13 +218,13 @@ static void skiplist_remove(abts_case *tc, void *data)
 
     ABTS_TRUE(tc, 0 == skiplist_get_size(tc, skiplist));
 
-    apr_skiplist_add(skiplist, "baton");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "baton"));
     ABTS_TRUE(tc, 1 == skiplist_get_size(tc, skiplist));
     val = apr_skiplist_find(skiplist, "baton", NULL);
     ABTS_PTR_NOTNULL(tc, val);
     ABTS_STR_EQUAL(tc, "baton", val);
 
-    apr_skiplist_add(skiplist, "baton");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "baton"));
     ABTS_TRUE(tc, 2 == skiplist_get_size(tc, skiplist));
     val = apr_skiplist_find(skiplist, "baton", NULL);
     ABTS_PTR_NOTNULL(tc, val);
@@ -236,7 +236,7 @@ static void skiplist_remove(abts_case *tc, void *data)
     ABTS_PTR_NOTNULL(tc, val);
     ABTS_STR_EQUAL(tc, "baton", val);
 
-    apr_skiplist_add(skiplist, "baton");
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(skiplist, "baton"));
     ABTS_TRUE(tc, 2 == skiplist_get_size(tc, skiplist));
     val = apr_skiplist_find(skiplist, "baton", NULL);
     ABTS_PTR_NOTNULL(tc, val);
@@ -273,7 +273,7 @@ static void skiplist_random_loop(abts_case *tc, void *data)
         else {
             batons[i] = apr_pstrdup(ptmp, batons[i % NUM_RAND]);
         }
-        apr_skiplist_add(sl, batons[i]);
+        ABTS_PTR_NOTNULL(tc, apr_skiplist_add(sl, batons[i]));
         val = apr_skiplist_find(sl, batons[i], NULL);
         ABTS_PTR_NOTNULL(tc, val);
         ABTS_STR_EQUAL(tc, batons[i], val);
@@ -288,16 +288,16 @@ typedef struct elem {
 } elem;
 
 
-static void add_int_to_skiplist(apr_skiplist *list, int n){
+static void add_int_to_skiplist(abts_case *tc, apr_skiplist *list, int n){
     int* a = apr_skiplist_alloc(list, sizeof(int));
     *a = n;
-    apr_skiplist_add(list, a);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, a));
 }
 
-static void add_elem_to_skiplist(apr_skiplist *list, elem n){
+static void add_elem_to_skiplist(abts_case *tc, apr_skiplist *list, elem n){
     elem* a = apr_skiplist_alloc(list, sizeof(elem));
     *a = n;
-    apr_skiplist_add(list, a);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, a));
 }
 
 static int comp(void *a, void *b){
@@ -368,7 +368,7 @@ static void skiplist_test(abts_case *tc, void *data) {
     
     /* insert 10 objects */
     for (i = 0; i < test_elems; ++i){
-        add_int_to_skiplist(list, i);
+        add_int_to_skiplist(tc, list, i);
     }
 
     /* remove all objects */
@@ -378,7 +378,7 @@ static void skiplist_test(abts_case *tc, void *data) {
 
     /* insert 10 objects again */
     for (i = test_elems; i < test_elems+test_elems; ++i){
-        add_int_to_skiplist(list, i);
+        add_int_to_skiplist(tc, list, i);
     }
 
     j = test_elems;
@@ -390,7 +390,7 @@ static void skiplist_test(abts_case *tc, void *data) {
     val = apr_skiplist_pop(list, NULL);
     ABTS_PTR_EQUAL(tc, val, NULL);
 
-    add_int_to_skiplist(list, 42);
+    add_int_to_skiplist(tc, list, 42);
     val = apr_skiplist_pop(list, NULL);
     ABTS_INT_EQUAL(tc, *val, 42); 
 
@@ -398,10 +398,10 @@ static void skiplist_test(abts_case *tc, void *data) {
     val = apr_skiplist_pop(list, NULL);
     ABTS_PTR_EQUAL(tc, val, NULL);
 
-    apr_skiplist_add(list, &first_forty_two);
-    add_int_to_skiplist(list, 1);
-    add_int_to_skiplist(list, 142);
-    apr_skiplist_add(list, &second_forty_two);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, &first_forty_two));
+    add_int_to_skiplist(tc, list, 1);
+    add_int_to_skiplist(tc, list, 142);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list, &second_forty_two));
     val = apr_skiplist_peek(list);
     ABTS_INT_EQUAL(tc, *val, 1);
     val = apr_skiplist_pop(list, NULL);
@@ -420,11 +420,11 @@ static void skiplist_test(abts_case *tc, void *data) {
 
     ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list2, ptmp));
     apr_skiplist_set_compare(list2, scomp, scomp);
-    add_elem_to_skiplist(list2, t2);
-    add_elem_to_skiplist(list2, t1);
-    add_elem_to_skiplist(list2, t3);
-    add_elem_to_skiplist(list2, t5);
-    add_elem_to_skiplist(list2, t4);
+    add_elem_to_skiplist(tc, list2, t2);
+    add_elem_to_skiplist(tc, list2, t1);
+    add_elem_to_skiplist(tc, list2, t3);
+    add_elem_to_skiplist(tc, list2, t5);
+    add_elem_to_skiplist(tc, list2, t4);
     val2 = apr_skiplist_pop(list2, NULL);
     ABTS_INT_EQUAL(tc, val2->a, 1);
     val2 = apr_skiplist_pop(list2, NULL);
@@ -442,10 +442,10 @@ static void skiplist_test(abts_case *tc, void *data) {
 
     ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list3, ptmp));
     apr_skiplist_set_compare(list3, acomp, acomp);
-    apr_skiplist_insert(list3, &t2);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(list3, &t2));
     val2 = apr_skiplist_find(list3, &t2, NULL);
     ABTS_PTR_EQUAL(tc, &t2, val2);
-    apr_skiplist_insert(list3, &t3);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_insert(list3, &t3));
     val2 = apr_skiplist_find(list3, &t3, NULL);
     ABTS_PTR_EQUAL(tc, &t3, val2);
     apr_skiplist_remove(list3, &t3, NULL);
@@ -458,31 +458,31 @@ static void skiplist_test(abts_case *tc, void *data) {
     ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list4, ptmp));
     apr_skiplist_set_compare(list4, scomp, scomp);
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t1);
+        add_elem_to_skiplist(tc, list4, t1);
     }
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t2);
+        add_elem_to_skiplist(tc, list4, t2);
     }
-    apr_skiplist_add(list4, &t2);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list4, &t2));
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t2);
+        add_elem_to_skiplist(tc, list4, t2);
     }
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t3);
+        add_elem_to_skiplist(tc, list4, t3);
     }
-    apr_skiplist_add(list4, &t3);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list4, &t3));
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t3);
+        add_elem_to_skiplist(tc, list4, t3);
     }
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t4);
+        add_elem_to_skiplist(tc, list4, t4);
     }
-    apr_skiplist_add(list4, &t4);
+    ABTS_PTR_NOTNULL(tc, apr_skiplist_add(list4, &t4));
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t4);
+        add_elem_to_skiplist(tc, list4, t4);
     }
     for (i = 0; i < 5; ++i){
-        add_elem_to_skiplist(list4, t5);
+        add_elem_to_skiplist(tc, list4, t5);
     }
     skiplist_remove_scomp(tc, list4, &t2);
     skiplist_remove_scomp(tc, list4, &t3);