generic/array: shot myself to the foot

diff --git a/lib/generic/array.h b/lib/generic/array.h
index a9316482b5d146c90f868e975f9017ec8995e1c2..c76228be7f0fd4b9df69b4b6e0c336edd79fefa0 100644 (file)
--- a/lib/generic/array.h
+++ b/lib/generic/array.h
@@ -133,10 +133,9 @@ static inline void array_std_free(void *baton, void *p)
 
 /**
  * Pop value from the end of the array.
- * @return 0 on success, <0 on failure
  */
 #define array_pop(array) \
-       array_del((array), (array).len - 1)
+       (array).len -= 1
 
 /**
  * Remove value at given index.

diff --git a/tests/test_array.c b/tests/test_array.c
index 4bfb792545da353589205c398598608c09939f1a..52f35e7cb277e80a42f73b9afabcd80e61c014f8 100644 (file)
--- a/tests/test_array.c
+++ b/tests/test_array.c
@@ -45,8 +45,7 @@ static void test_array(void **state)
        /* Delete elements. */
        array_del(arr, 0);
        for (size_t i = arr.len; --i;) {
-               ret = array_pop(arr);
-               assert_true(ret == 0);
+               array_pop(arr);
        }
 
        /* Overfill. */