enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edbus: move function up - no fwd declaration when not needed 

SVN revision: 79177
This commit is contained in:
Lucas De Marchi 2012-11-12 16:07:01 +00:00
parent e619f29e6e
commit 0bc346c979
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
legacy/edbus/src/lib/edbus_service.c
View File

@ -52,7 +52,6 @@ static DBusHandlerResult _object_handler(DBusConnection *conn, DBusMessage *mess
static void _object_free(EDBus_Service_Object *obj);
static void _interface_free(EDBus_Service_Interface *interface);
static void _on_connection_free(void *data, const void *dead_pointer);
static EDBus_Service_Object *_edbus_service_object_parent_find(EDBus_Service_Object *obj);
static DBusObjectPathVTable vtable = {
_object_unregister,
@ -487,6 +486,34 @@ edbus_service_shutdown(void)
_default_interfaces_free();
}
static EDBus_Service_Object *
_edbus_service_object_parent_find(EDBus_Service_Object *obj)
{
size_t len = strlen(obj->path);
char *path = strdup(obj->path);
char *slash;
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;
}
}
free(path);
return NULL;
}
static EDBus_Service_Object *
_edbus_service_object_add(EDBus_Connection *conn, const char *path)
{
@ -1092,31 +1119,3 @@ edbus_service_property_invalidate_set(EDBus_Service_Interface *iface, const char
iface->prop_invalidated = eina_array_new(1);
return eina_array_push(iface->prop_invalidated, prop);
}
static EDBus_Service_Object *
_edbus_service_object_parent_find(EDBus_Service_Object *obj)
{
size_t len = strlen(obj->path);
char *path = strdup(obj->path);
char *slash;
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;
}
}
free(path);
return NULL;
}