while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
AtspiAccessible *accessible;
- GArray *new_array;
accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
- new_array = g_array_append_val (ret, accessible);
- if (new_array)
- ret = new_array;
+ ret = g_array_append_val (ret, accessible);
/* Iter was moved already, so no need to call dbus_message_iter_next */
}
dbus_message_unref (message);
static void
atspi_device_listener_init (AtspiDeviceListener *listener)
{
- GList *new_list;
do
{
listener->id = listener_id++;
} while (!id_is_free (listener->id));
- new_list = g_list_append (device_listeners, listener);
- if (new_list) device_listeners = new_list;
+ device_listeners = g_list_append (device_listeners, listener);
}
static void
new_handler = device_event_handler_new (callback,
callback_destroyed, user_data);
- if (new_handler)
- {
- GList *new_list;
- new_list = g_list_prepend (listener->callbacks, new_handler);
- if (new_list)
- listener->callbacks = new_list;
- }
+ listener->callbacks = g_list_prepend (listener->callbacks, new_handler);
}
/**
{
if (g_list_find (event->source->children, child))
return;
- GList *new_list = g_list_insert (event->source->children, g_object_ref (child), event->detail1);
- if (new_list)
- event->source->children = new_list;
+ event->source->children = g_list_insert (event->source->children,
+ g_object_ref (child),
+ event->detail1);
}
else if (g_list_find (event->source->children, child))
{
if (tmp == NULL) return FALSE;
category = strtok_r (tmp, ":", &saveptr);
if (category) category = g_strdup (category);
- if (!category) goto oom;
name = strtok_r (NULL, ":", &saveptr);
if (name)
{
name = g_strdup (name);
- if (!name) goto oom;
detail = strtok_r (NULL, ":", &saveptr);
if (detail) detail = g_strdup (detail);
}
else if (detail) g_free (detail);
g_free (tmp);
return TRUE;
-oom:
- if (tmp) g_free (tmp);
- if (category) g_free (category);
- if (name) g_free (name);
- if (detail) g_free (detail);
- return FALSE;
}
static void
{
EventListenerEntry *e;
DBusError d_error;
- GList *new_list;
DBusMessage *message, *reply;
GPtrArray *matchrule_array;
gint i;
g_free (e);
return FALSE;
}
- new_list = g_list_prepend (event_listeners, e);
- if (!new_list)
- {
- listener_entry_free (e);
- return FALSE;
- }
- event_listeners = new_list;
+ event_listeners = g_list_prepend (event_listeners, e);
dbus_error_init (&d_error);
for (i = 0; i < matchrule_array->len; i++)
{
AtspiAccessible *obj = ref_accessible (bus_name, atspi_path_root);
if (obj)
{
- GList *new_list = g_list_append (a->children, obj);
- if (new_list)
- {
- a->children = new_list;
- return TRUE;
- }
+ a->children = g_list_append (a->children, obj);
+ return TRUE;
}
else
{
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
AtspiAccessible *accessible;
- GArray *new_array;
accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
- new_array = g_array_append_val (relation->targets, accessible);
- if (new_array)
- relation->targets = new_array;
+ relation->targets = g_array_append_val (relation->targets, accessible);
/* Iter was moved already, so no need to call dbus_message_iter_next */
}
return relation;
for (i = 0; i < 64; i++)
{
if (set->states & val)
- {
- GArray *new_array = g_array_append_val (ret, i);
- if (new_array)
- ret = new_array;
- }
+ ret = g_array_append_val (ret, i);
val <<= 1;
}
return ret;