X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=resource%2Fcsdk%2Fconnectivity%2Fcommon%2Fsrc%2Fuarraylist.c;h=b795f10ad3ea770641f9fd7503f8a3f6bbfde819;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=d205aa55b83a70980788792789307d4668c3bd7a;hpb=8b133a8a1b3d082aa9e775d6cc16b6862a2da650;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/common/src/uarraylist.c b/resource/csdk/connectivity/common/src/uarraylist.c
index d205aa5..b795f10 100644
--- a/resource/csdk/connectivity/common/src/uarraylist.c
+++ b/resource/csdk/connectivity/common/src/uarraylist.c
@@ -27,23 +27,23 @@
 #define TAG "UARRAYLIST"
 
 /**
- * Use this default size when initialized
+ * Use this default capacity when initialized
  */
-#define U_ARRAYLIST_DEFAULT_SIZE 1
+#define U_ARRAYLIST_DEFAULT_CAPACITY 1
 
 u_arraylist_t *u_arraylist_create()
 {
-    u_arraylist_t *list = (u_arraylist_t *) OICMalloc(sizeof(u_arraylist_t));
+    u_arraylist_t *list = (u_arraylist_t *) OICCalloc(1, sizeof(u_arraylist_t));
     if (!list)
     {
         OIC_LOG(DEBUG, TAG, "Out of memory");
         return NULL;
     }
 
-    list->size = U_ARRAYLIST_DEFAULT_SIZE;
+    list->capacity = U_ARRAYLIST_DEFAULT_CAPACITY;
     list->length = 0;
 
-    list->data = (void **) OICMalloc(list->size * sizeof(list->data[0]));
+    list->data = (void **) OICMalloc(list->capacity * sizeof(list->data[0]));
     if (!list->data)
     {
         OIC_LOG(DEBUG, TAG, "Out of memory");
@@ -66,22 +66,23 @@ void u_arraylist_free(u_arraylist_t **list)
     *list = NULL;
 }
 
-void u_arraylist_reserve(u_arraylist_t *list, size_t count)
+bool u_arraylist_reserve(u_arraylist_t *list, size_t count)
 {
-    if (list && (count > list->size))
+    if (list && (count > list->capacity))
     {
         void *tmp = OICRealloc(list->data, count * sizeof(list->data[0]));
         if (!tmp)
         {
             OIC_LOG(DEBUG, TAG, "Memory reallocation failed.");
-            // Note that this is considered non-fatal.
+            return false;
         }
         else
         {
             list->data = (void **) tmp;
-            list->size = count;
+            list->capacity = count;
         }
     }
+    return true;
 }
 
 void u_arraylist_shrink_to_fit(u_arraylist_t *list)
@@ -91,8 +92,8 @@ void u_arraylist_shrink_to_fit(u_arraylist_t *list)
         return;
     }
 
-    if ((list->size > list->length)
-        && (list->length >= U_ARRAYLIST_DEFAULT_SIZE))
+    if ((list->capacity > list->length)
+        && (list->length >= U_ARRAYLIST_DEFAULT_CAPACITY))
     {
         void *tmp = OICRealloc(list->data,
                                list->length * sizeof(list->data[0]));
@@ -104,7 +105,7 @@ void u_arraylist_shrink_to_fit(u_arraylist_t *list)
         else
         {
             list->data = (void **) tmp;
-            list->size = list->length;
+            list->capacity = list->length;
         }
     }
 }
@@ -124,29 +125,51 @@ void *u_arraylist_get(const u_arraylist_t *list, uint32_t index)
     return NULL;
 }
 
+bool u_arraylist_get_index(const u_arraylist_t *list, const void *data, uint32_t *index)
+{
+    if (!list || !data)
+    {
+        return false;
+    }
+
+    for (uint32_t i = 0; i < list->length; i++)
+    {
+        if (data == list->data[i])
+        {
+            *index = i;
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool u_arraylist_add(u_arraylist_t *list, void *data)
 {
-    static const double GROWTH_FACTOR = 1.5;
     if (!list)
     {
         return false;
     }
 
-    if (list->size <= list->length)
+    if (list->capacity <= list->length)
     {
-        uint32_t new_size = (list->size * GROWTH_FACTOR) + 0.5;
+        // Does a non-FP calcuation of the 1.5 growth factor. Helpful for
+        // certain limited platforms.
+        size_t new_capacity = ((list->capacity * 3) + 1) / 2;
+
         // In case the re-alloc returns null, use a local variable to avoid
         // losing the current block of memory.
-        void *tmp = OICRealloc(list->data, new_size * sizeof(list->data[0]));
+        void *tmp = OICRealloc(list->data,
+                               new_capacity * sizeof(list->data[0]));
         if (!tmp)
         {
             OIC_LOG(DEBUG, TAG, "Memory reallocation failed.");
             return false;
         }
         list->data = (void **) tmp;
-        memset(list->data + list->size, 0,
-               (new_size - list->size) * sizeof(list->data[0]));
-        list->size = new_size;
+        memset(list->data + list->capacity, 0,
+               (new_capacity - list->capacity) * sizeof(list->data[0]));
+        list->capacity = (uint32_t)new_capacity;
     }
 
     list->data[list->length] = data;
@@ -195,7 +218,7 @@ bool u_arraylist_contains(const u_arraylist_t *list, const void *data)
         return false;
     }
 
-    for (uint32_t i = 0; i < list->size; i++)
+    for (uint32_t i = 0; i < list->length; i++)
     {
         if (data == list->data[i])
         {