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

Timestamp:

2019-10-06T19:47:15Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

9559cf8

Parents:

102f641

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-09-06 17:58:36)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:15)

Message:

Replacing int with errno_t

The merged code from system-daemon still used the type int
for indicating an error instead of using errno_t. This
commit corrects this mistake

File:

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

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

@@ -44 +44 @@
 #include <stdlib.h>
 
-static int dyn_array_realloc(dyn_array_t *da, size_t capacity)
+static errno_t dyn_array_realloc(dyn_array_t *da, size_t capacity)
 {
         if (capacity == da->capacity) {
@@ -70 +70 @@
         assert(index < da->size);
         _dyn_array_unshift(da, index, 1);
-        int rc = dyn_array_reserve(da, da->size);
+        errno_t rc = dyn_array_reserve(da, da->size);
         assert(rc == EOK);
 }
@@ -92 +92 @@
 
         _dyn_array_unshift(da, begin, end - begin);
-        int rc = dyn_array_reserve(da, da->size);
+        errno_t rc = dyn_array_reserve(da, da->size);
         assert(rc == EOK);
 }
@@ -104 +104 @@
  * @return ENOMEM when allocation fails
  */
-int dyn_array_concat(dyn_array_t *da1, dyn_array_t *da2)
+errno_t dyn_array_concat(dyn_array_t *da1, dyn_array_t *da2)
 {
         assert(da1->_item_size == da2->_item_size);
 
-        int rc = dyn_array_reserve(da1, da1->size + da2->size);
+        errno_t rc = dyn_array_reserve(da1, da1->size + da2->size);
         if (rc != EOK) {
                 return rc;
@@ -129 +129 @@
  * @return ENOMEM
  */
-int dyn_array_reserve(dyn_array_t *da, size_t capacity)
+errno_t dyn_array_reserve(dyn_array_t *da, size_t capacity)
 {
         const size_t factor = 2;