Signed-off-by: Stefan Schmidt <ste...@datenfreihafen.org>
---
e_dbus/src/lib/bluez/e_bluez_element.c | 16 ++++++++--------
e_dbus/src/lib/connman0_7x/e_connman_element.c | 16 ++++++++--------
e_dbus/src/lib/ofono/e_ofono_element.c | 16 ++++++++--------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/e_dbus/src/lib/bluez/e_bluez_element.c
b/e_dbus/src/lib/bluez/e_bluez_element.c
index bafb45b..c68983f 100644
--- a/e_dbus/src/lib/bluez/e_bluez_element.c
+++ b/e_dbus/src/lib/bluez/e_bluez_element.c
@@ -498,9 +498,9 @@ _e_bluez_element_array_match(E_Bluez_Array *old,
E_Bluez_Array *new, const char
if (old->type != DBUS_TYPE_OBJECT_PATH)
return;
- if ((!new) || (!new->array) || eina_array_count_get(new->array) == 0)
+ if ((!new) || (!new->array) || eina_array_count(new->array) == 0)
{
- if ((!old) || (!old->array) || eina_array_count_get(old->array) == 0)
+ if ((!old) || (!old->array) || eina_array_count(old->array) == 0)
{
return;
}
@@ -518,7 +518,7 @@ _e_bluez_element_array_match(E_Bluez_Array *old,
E_Bluez_Array *new, const char
if (item_old == item_new)
{
i_new++;
- if (i_new >= eina_array_count_get(new->array))
+ if (i_new >= eina_array_count(new->array))
{
i_old++;
break;
@@ -533,7 +533,7 @@ _e_bluez_element_array_match(E_Bluez_Array *old,
E_Bluez_Array *new, const char
}
}
- for(; i_new < eina_array_count_get(new->array); iter_new++, i_new++)
+ for(; i_new < eina_array_count(new->array); iter_new++, i_new++)
{
Eina_Bool found = EINA_FALSE;
item_new = *iter_new;
@@ -569,7 +569,7 @@ _e_bluez_element_array_match(E_Bluez_Array *old,
E_Bluez_Array *new, const char
}
out_remove_remaining:
- for(; i_old < eina_array_count_get(old->array); iter_old++, i_old++)
+ for(; i_old < eina_array_count(old->array); iter_old++, i_old++)
{
E_Bluez_Element *e;
item_old = *iter_old;
@@ -750,7 +750,7 @@ e_bluez_element_bytes_array_get_stringshared(const
E_Bluez_Element *element, con
if ((!array) || (!(array->array)))
return NULL;
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(unsigned char));
if (!ret)
{
@@ -806,7 +806,7 @@ e_bluez_element_objects_array_get_stringshared(const
E_Bluez_Element *element, c
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(E_Bluez_Element *));
if (!ret)
{
@@ -870,7 +870,7 @@ e_bluez_element_strings_array_get_stringshared(const
E_Bluez_Element *element, c
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(char *));
if (!ret)
{
diff --git a/e_dbus/src/lib/connman0_7x/e_connman_element.c
b/e_dbus/src/lib/connman0_7x/e_connman_element.c
index 605f61f..336c0c7 100644
--- a/e_dbus/src/lib/connman0_7x/e_connman_element.c
+++ b/e_dbus/src/lib/connman0_7x/e_connman_element.c
@@ -490,9 +490,9 @@ _e_connman_element_array_match(E_Connman_Array *old,
E_Connman_Array *new, const
if (old->type != DBUS_TYPE_OBJECT_PATH)
return;
- if ((!new) || (!new->array) || eina_array_count_get(new->array) == 0)
+ if ((!new) || (!new->array) || eina_array_count(new->array) == 0)
{
- if ((!old) || (!old->array) || eina_array_count_get(old->array) == 0)
+ if ((!old) || (!old->array) || eina_array_count(old->array) == 0)
{
return;
}
@@ -510,7 +510,7 @@ _e_connman_element_array_match(E_Connman_Array *old,
E_Connman_Array *new, const
if (item_old == item_new)
{
i_new++;
- if (i_new >= eina_array_count_get(new->array))
+ if (i_new >= eina_array_count(new->array))
{
i_old++;
break;
@@ -525,7 +525,7 @@ _e_connman_element_array_match(E_Connman_Array *old,
E_Connman_Array *new, const
}
}
- for(; i_new < eina_array_count_get(new->array); iter_new++, i_new++)
+ for(; i_new < eina_array_count(new->array); iter_new++, i_new++)
{
Eina_Bool found = EINA_FALSE;
item_new = *iter_new;
@@ -561,7 +561,7 @@ _e_connman_element_array_match(E_Connman_Array *old,
E_Connman_Array *new, const
}
out_remove_remaining:
- for(; i_old < eina_array_count_get(old->array); iter_old++, i_old++)
+ for(; i_old < eina_array_count(old->array); iter_old++, i_old++)
{
E_Connman_Element *e;
item_old = *iter_old;
@@ -742,7 +742,7 @@ e_connman_element_bytes_array_get_stringshared(const
E_Connman_Element *element,
if ((!array) || (!(array->array)))
return NULL;
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(unsigned char));
if (!ret)
{
@@ -798,7 +798,7 @@ e_connman_element_objects_array_get_stringshared(const
E_Connman_Element *elemen
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(E_Connman_Element *));
if (!ret)
{
@@ -1972,7 +1972,7 @@
e_connman_element_property_dict_strings_array_get_stringshared(const E_Connman_E
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(char *));
if (!ret)
{
diff --git a/e_dbus/src/lib/ofono/e_ofono_element.c
b/e_dbus/src/lib/ofono/e_ofono_element.c
index 69f2bbc..716c071 100644
--- a/e_dbus/src/lib/ofono/e_ofono_element.c
+++ b/e_dbus/src/lib/ofono/e_ofono_element.c
@@ -518,9 +518,9 @@ _e_ofono_element_array_match(E_Ofono_Array *old,
E_Ofono_Array *new, const char
/* is this a list of interfaces? */
interfaces = !strcmp(prop_name, "Interfaces");
- if ((!new) || (!new->array) || eina_array_count_get(new->array) == 0)
+ if ((!new) || (!new->array) || eina_array_count(new->array) == 0)
{
- if ((!old) || (!old->array) || eina_array_count_get(old->array) == 0)
+ if ((!old) || (!old->array) || eina_array_count(old->array) == 0)
{
return;
}
@@ -538,7 +538,7 @@ _e_ofono_element_array_match(E_Ofono_Array *old,
E_Ofono_Array *new, const char
if (item_old == item_new)
{
i_new++;
- if (i_new >= eina_array_count_get(new->array))
+ if (i_new >= eina_array_count(new->array))
{
i_old++;
break;
@@ -553,7 +553,7 @@ _e_ofono_element_array_match(E_Ofono_Array *old,
E_Ofono_Array *new, const char
}
}
- for(; i_new < eina_array_count_get(new->array); iter_new++, i_new++)
+ for(; i_new < eina_array_count(new->array); iter_new++, i_new++)
{
Eina_Bool found = EINA_FALSE;
item_new = *iter_new;
@@ -603,7 +603,7 @@ _e_ofono_element_array_match(E_Ofono_Array *old,
E_Ofono_Array *new, const char
}
out_remove_remaining:
- for(; i_old < eina_array_count_get(old->array); iter_old++, i_old++)
+ for(; i_old < eina_array_count(old->array); iter_old++, i_old++)
{
E_Ofono_Element *e;
item_old = *iter_old;
@@ -791,7 +791,7 @@ e_ofono_element_bytes_array_get_stringshared(const
E_Ofono_Element *element, con
if ((!array) || (!(array->array)))
return NULL;
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(unsigned char));
if (!ret)
{
@@ -847,7 +847,7 @@ e_ofono_element_objects_array_get_stringshared(const
E_Ofono_Element *element, c
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(E_Ofono_Element *));
if (!ret)
{
@@ -911,7 +911,7 @@ e_ofono_element_strings_array_get_stringshared(const
E_Ofono_Element *element, c
return EINA_FALSE;
}
- *count = eina_array_count_get(array->array);
+ *count = eina_array_count(array->array);
ret = malloc(*count * sizeof(char *));
if (!ret)
{
--
1.7.8.3
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
