diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-03-09 20:10:25 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-03-09 20:10:25 +0000 |
| commit | 26e7f9195005deda91eea83f368c0d53ec95856c (patch) | |
| tree | dfac803d97563ae5d8e116efa19dae10cd72ad18 /hcid/dbus-manager.c | |
| parent | ddeb6ab85924294cbeb6c64321cadef508c347aa (diff) | |
More use of the generic logging functions
Diffstat (limited to 'hcid/dbus-manager.c')
| -rw-r--r-- | hcid/dbus-manager.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c index 784266fd..ad04f862 100644 --- a/hcid/dbus-manager.c +++ b/hcid/dbus-manager.c @@ -139,15 +139,14 @@ DBusHandlerResult msg_func_manager(DBusConnection *conn, DBusMessage *msg, void const char *iface; const char *method; const char *signature; - uint32_t error = BLUEZ_EDBUS_UNKNOWN_METHOD; + uint32_t err = BLUEZ_EDBUS_UNKNOWN_METHOD; DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; iface = dbus_message_get_interface(msg); method = dbus_message_get_member(msg); signature = dbus_message_get_signature(msg); - syslog(LOG_INFO, "Manager path:%s method:%s", - dbus_message_get_path(msg), method); + info("Manager path:%s method:%s", dbus_message_get_path(msg), method); if (strcmp(iface, MANAGER_INTERFACE)) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -157,21 +156,21 @@ DBusHandlerResult msg_func_manager(DBusConnection *conn, DBusMessage *msg, void continue; if (strcmp(handlers->signature, signature) != 0) - error = BLUEZ_EDBUS_WRONG_SIGNATURE; + err = BLUEZ_EDBUS_WRONG_SIGNATURE; else { reply = handlers->handler_func(msg, data); - error = 0; + err = 0; } ret = DBUS_HANDLER_RESULT_HANDLED; } - if (error) - reply = bluez_new_failure_msg(msg, error); + if (err) + reply = bluez_new_failure_msg(msg, err); if (reply) { if (!dbus_connection_send (conn, reply, NULL)) - syslog(LOG_ERR, "Can't send reply message"); + error("Can't send reply message"); dbus_message_unref(reply); } |