diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-04-03 18:01:20 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-04-03 18:01:20 +0000 |
| commit | 62acaff4f9dd436a453fb819c444f9abf7976327 (patch) | |
| tree | ffd6dd494534fb80799601707449b64d7835f8b8 /hcid | |
| parent | deac38234c118208d6ab31dcb26040e2a154ad2b (diff) | |
search_service cleanup
Diffstat (limited to 'hcid')
| -rw-r--r-- | hcid/dbus-database.c | 6 | ||||
| -rw-r--r-- | hcid/dbus-service.c | 2 | ||||
| -rw-r--r-- | hcid/dbus-service.h | 2 | ||||
| -rw-r--r-- | hcid/manager.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index f47df37d..93f37ad4 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -389,7 +389,7 @@ static DBusHandlerResult unregister_service(DBusConnection *conn, sender = dbus_message_get_sender(msg); - service = search_service(conn, ident); + service = search_service(ident); if (!service) return error_service_does_not_exist(conn, msg); @@ -421,7 +421,7 @@ static DBusHandlerResult request_authorization(DBusConnection *conn, sender = dbus_message_get_sender(msg); - service = search_service(conn, sender); + service = search_service(sender); if (!service) { debug("Got RequestAuthorization from non-service owner %s", sender); @@ -464,7 +464,7 @@ static DBusHandlerResult cancel_authorization_request(DBusConnection *conn, sender = dbus_message_get_sender(msg); - service = search_service(conn, sender); + service = search_service(sender); if (!service) return error_not_authorized(conn, msg); diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index b6875833..1d201a04 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -826,7 +826,7 @@ void release_services(DBusConnection *conn) services = NULL; } -struct service *search_service(DBusConnection *conn, const char *pattern) +struct service *search_service(const char *pattern) { GSList *l; diff --git a/hcid/dbus-service.h b/hcid/dbus-service.h index dca6c4e5..2e7d78ce 100644 --- a/hcid/dbus-service.h +++ b/hcid/dbus-service.h @@ -51,7 +51,7 @@ void release_services(DBusConnection *conn); void append_available_services(DBusMessageIter *iter); -struct service *search_service(DBusConnection *conn, const char *pattern); +struct service *search_service(const char *pattern); int service_start(struct service *service, DBusConnection *conn); diff --git a/hcid/manager.c b/hcid/manager.c index 3e36d184..d470e53b 100644 --- a/hcid/manager.c +++ b/hcid/manager.c @@ -270,7 +270,7 @@ static DBusHandlerResult find_service(DBusConnection *conn, DBUS_TYPE_INVALID)) return error_invalid_arguments(conn, msg, NULL); - service = search_service(conn, pattern); + service = search_service(pattern); if (!service) return error_no_such_service(conn, msg); @@ -320,7 +320,7 @@ static DBusHandlerResult activate_service(DBusConnection *conn, DBUS_TYPE_INVALID)) return error_invalid_arguments(conn, msg, NULL); - service = search_service(conn, pattern); + service = search_service(pattern); if (!service) return error_no_such_service(conn, msg); |