edbus: simplify and fix formatting

SVN revision: 79178
This commit is contained in:
Lucas De Marchi 2012-11-12 16:07:06 +00:00
parent 0bc346c979
commit 312bb0d887
1 changed files with 5 additions and 8 deletions

View File

@ -489,6 +489,7 @@ edbus_service_shutdown(void)
static EDBus_Service_Object *
_edbus_service_object_parent_find(EDBus_Service_Object *obj)
{
EDBus_Service_Object *parent = NULL;
size_t len = strlen(obj->path);
char *path = strdup(obj->path);
char *slash;
@ -496,22 +497,18 @@ _edbus_service_object_parent_find(EDBus_Service_Object *obj)
for (slash = path[len] != '/' ? &path[len - 1] : &path[len - 2];
slash > path; slash--)
{
EDBus_Service_Object *parent = NULL;
if (*slash != '/')
continue;
*slash = '\0';
if (dbus_connection_get_object_path_data(obj->conn->dbus_conn, path,(void **)&parent) && parent != NULL)
{
free(path);
return parent;
}
if (dbus_connection_get_object_path_data(obj->conn->dbus_conn,
path, (void **) &parent) && parent != NULL)
break;
}
free(path);
return NULL;
return parent;
}
static EDBus_Service_Object *