Changeset dd5c623 in mainline for uspace/lib/c/generic/adt/dyn_array.c

Timestamp:

2019-08-03T09:44:51Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

4224ef7

Parents:

dda2602

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:21:11)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:44:51)

Message:

dyn_array: Non-allocating initialization API

File:

• uspace/lib/c/generic/adt/dyn_array.c (modified) (3 diffs)

uspace/lib/c/generic/adt/dyn_array.c

@@ -73 +73 @@
         assert(index < da->size);
         _dyn_array_unshift(da, index, 1);
-        int rc = _dyn_array_reserve(da, da->size);
+        int rc = dyn_array_reserve(da, da->size);
         assert(rc == EOK);
 }
@@ -83 +83 @@
 }
 
-int _dyn_array_initialize(dyn_array_t *da, size_t item_size, size_t capacity)
-{
-        da->_item_size = item_size;
-        da->_data = NULL;
-
-        da->capacity = 0;
-        da->size = 0;
-
-        return _dyn_array_reserve(da, capacity);
-}
-
 /** Grows/shrinks array so that it effeciently stores desired capacity
  *
  * @param      da
- * @param[in]  desired capacity of array
+ * @param[in]  desired capacity of array (items)
  *
  * @return EOK
  * @return ENOMEM
  */
-int _dyn_array_reserve(dyn_array_t *da, size_t capacity)
+int dyn_array_reserve(dyn_array_t *da, size_t capacity)
 {
         const size_t factor = 2;
@@ -115 +104 @@
 
         return dyn_array_realloc(da, new_capacity);
+}
+
+void _dyn_array_initialize(dyn_array_t *da, size_t item_size)
+{
+        da->_item_size = item_size;
+        da->_data = NULL;
+
+        da->capacity = 0;
+        da->size = 0;
 }