Changeset c8891c8 in mainline

Timestamp:

2019-08-03T08:26:04Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

d7c5fc0

Parents:

62d3d87

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-04-22 17:50:20)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 08:26:04)

Message:

dyn_array: Remove runtime pointer arithmetics

Location:

uspace/lib/c

Files:

• generic/adt/dyn_array.c (modified) (1 diff)
• include/adt/dyn_array.h (modified) (2 diffs)

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

@@ -91 +91 @@
 }
 
-void *_dyn_array_get(dyn_array_t *da, size_t index)
-{
-        assert(index < da->size);
-        return da->_data + (index * da->_item_size);
-}
-
 /** Grows/shrinks array so that it effeciently stores desired capacity
  *

uspace/lib/c/include/adt/dyn_array.h

@@ -67 +67 @@
  */
 #define dyn_array_at(dyn_array, type, index)                                   \
-        (*((type *) _dyn_array_get((dyn_array), index)))
+        (*((type *) (dyn_array)->_data + index))
 
 /** Insert item at given position, shift rest of array
@@ -108 +108 @@
 
 extern int _dyn_array_initialize(dyn_array_t *, size_t, size_t);
-extern void *_dyn_array_get(dyn_array_t *, size_t);
 extern int  _dyn_array_reserve(dyn_array_t *, size_t);
 extern void _dyn_array_shift(dyn_array_t *, size_t, size_t);