Hey,
Here is a patch which fix shadow variables. Gustavo, as it's mainly your
code, can you review the patch below, please (especially the change data
---> odata in e_dbus_signal.c) ?
Vincent
Index: src/lib/ofono/e_ofono_element.c
===================================================================
--- src/lib/ofono/e_ofono_element.c (revision 49765)
+++ src/lib/ofono/e_ofono_element.c (working copy)
@@ -757,7 +757,7 @@
}
Eina_Bool
-e_ofono_element_objects_array_get_stringshared(const E_Ofono_Element *element,
const char *property, unsigned int *count, E_Ofono_Element ***elements)
+e_ofono_element_objects_array_get_stringshared(const E_Ofono_Element *element,
const char *property, unsigned int *count, E_Ofono_Element ***elts)
{
E_Ofono_Element **ret, **p;
Eina_Array_Iterator iterator;
@@ -769,10 +769,10 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(element, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(property, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0);
- EINA_SAFETY_ON_NULL_RETURN_VAL(elements, 0);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(elts, 0);
*count = 0;
- *elements = NULL;
+ *elts = NULL;
if (!e_ofono_element_property_get_stringshared
(element, property, &type, &array))
@@ -813,7 +813,7 @@
p++;
}
*count = p - ret;
- *elements = ret;
+ *elts = ret;
return 1;
}
Index: src/lib/bluez/e_bluez_element.c
===================================================================
--- src/lib/bluez/e_bluez_element.c (revision 49765)
+++ src/lib/bluez/e_bluez_element.c (working copy)
@@ -712,7 +712,7 @@
}
Eina_Bool
-e_bluez_element_objects_array_get_stringshared(const E_Bluez_Element *element,
const char *property, unsigned int *count, E_Bluez_Element ***elements)
+e_bluez_element_objects_array_get_stringshared(const E_Bluez_Element *element,
const char *property, unsigned int *count, E_Bluez_Element ***elts)
{
E_Bluez_Element **ret, **p;
Eina_Array_Iterator iterator;
@@ -724,10 +724,10 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(element, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(property, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0);
- EINA_SAFETY_ON_NULL_RETURN_VAL(elements, 0);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(elts, 0);
*count = 0;
- *elements = NULL;
+ *elts = NULL;
if (!e_bluez_element_property_get_stringshared
(element, property, &type, &array))
@@ -768,7 +768,7 @@
p++;
}
*count = p - ret;
- *elements = ret;
+ *elts = ret;
return 1;
}
Index: src/lib/connman/e_connman_element.c
===================================================================
--- src/lib/connman/e_connman_element.c (revision 49765)
+++ src/lib/connman/e_connman_element.c (working copy)
@@ -733,7 +733,7 @@
}
bool
-e_connman_element_objects_array_get_stringshared(const E_Connman_Element
*element, const char *property, unsigned int *count, E_Connman_Element
***elements)
+e_connman_element_objects_array_get_stringshared(const E_Connman_Element
*element, const char *property, unsigned int *count, E_Connman_Element ***elts)
{
E_Connman_Element **ret, **p;
Eina_Array_Iterator iterator;
@@ -745,10 +745,10 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(element, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(property, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0);
- EINA_SAFETY_ON_NULL_RETURN_VAL(elements, 0);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(elts, 0);
*count = 0;
- *elements = NULL;
+ *elts = NULL;
if (!e_connman_element_property_get_stringshared
(element, property, &type, &array))
@@ -789,7 +789,7 @@
p++;
}
*count = p - ret;
- *elements = ret;
+ *elts = ret;
return 1;
}
Index: src/lib/dbus/e_dbus_signal.c
===================================================================
--- src/lib/dbus/e_dbus_signal.c (revision 49765)
+++ src/lib/dbus/e_dbus_signal.c (working copy)
@@ -198,17 +198,17 @@
/* if we have a sender, and it is not a unique name, we need to know
the unique name to match since signals will have the name owner as ther
sender. */
if (sender && sender[0] != ':')
{
- struct cb_name_owner_data *data;
- data = malloc(sizeof(*data));
- if (!data)
+ struct cb_name_owner_data *odata;
+ odata = malloc(sizeof(struct cb_name_owner_data));
+ if (!odata)
{
e_dbus_signal_handler_free(sh);
return NULL;
}
- data->conn = conn;
- data->sh = sh;
+ odata->conn = conn;
+ odata->sh = sh;
sh->get_name_owner_pending =
- e_dbus_get_name_owner(conn, sender, cb_name_owner, data);
+ e_dbus_get_name_owner(conn, sender, cb_name_owner, odata);
}
conn->signal_handlers = eina_list_append(conn->signal_handlers, sh);
Index: src/lib/dbus/e_dbus_object.c
===================================================================
--- src/lib/dbus/e_dbus_object.c (revision 49765)
+++ src/lib/dbus/e_dbus_object.c (working copy)
@@ -601,7 +601,7 @@
_introspect_interface_append(Eina_Strbuf *buf, E_DBus_Interface *iface,
int level)
{
E_DBus_Method *method;
- E_DBus_Signal *signal;
+ E_DBus_Signal *sig;
Eina_List *l;
_introspect_indent_append(buf, level);
@@ -613,8 +613,8 @@
DBG("introspect iface: %s", iface->name);
EINA_LIST_FOREACH(iface->methods, l, method)
_introspect_method_append(buf, method, level);
- EINA_LIST_FOREACH(iface->signals, l, signal)
- _introspect_signal_append(buf, signal, level);
+ EINA_LIST_FOREACH(iface->signals, l, sig)
+ _introspect_signal_append(buf, sig, level);
level--;
_introspect_indent_append(buf, level);
@@ -669,24 +669,24 @@
}
static void
-_introspect_signal_append(Eina_Strbuf *buf, E_DBus_Signal *signal, int level)
+_introspect_signal_append(Eina_Strbuf *buf, E_DBus_Signal *sig, int level)
{
DBusSignatureIter iter;
char *type;
_introspect_indent_append(buf, level);
- DBG("introspect signal: %s", signal->name);
+ DBG("introspect signal: %s", sig->name);
eina_strbuf_append(buf, "<signal name=\"");
- eina_strbuf_append(buf, signal->name);
+ eina_strbuf_append(buf, sig->name);
eina_strbuf_append(buf, "\">\n");
level++;
/* append args */
- if (signal->signature &&
- signal->signature[0] &&
- dbus_signature_validate(signal->signature, NULL))
+ if (sig->signature &&
+ sig->signature[0] &&
+ dbus_signature_validate(sig->signature, NULL))
{
- dbus_signature_iter_init(&iter, signal->signature);
+ dbus_signature_iter_init(&iter, sig->signature);
while ((type = dbus_signature_iter_get_signature(&iter)))
{
_introspect_arg_append(buf, type, NULL, level);
Index: src/bin/e_dbus_ukit_test.c
===================================================================
--- src/bin/e_dbus_ukit_test.c (revision 49765)
+++ src/bin/e_dbus_ukit_test.c (working copy)
@@ -24,7 +24,7 @@
printf("\t%s = [%d]\n", (char*)key, e_ukit_property_int_get(&props,
key, &err));
break;
case E_UKIT_PROPERTY_TYPE_UINT32:
- printf("\t%s = [%u]\n", (char*)key, (long long
unsigned)e_ukit_property_uint32_get(&props, key, &err));
+ printf("\t%s = [%llu]\n", (char*)key, (long long
unsigned)e_ukit_property_uint32_get(&props, key, &err));
break;
case E_UKIT_PROPERTY_TYPE_UINT64:
printf("\t%s = [%llu]\n", (char*)key, (long long
unsigned)e_ukit_property_uint64_get(&props, key, &err));
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
