diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-10-26 21:27:40 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-10-26 21:27:40 +0000 |
| commit | 854f901f491ccda79aee11edc3d59109cb229d28 (patch) | |
| tree | cfaf27b1e11af5c7504e6825e205d9d1ed2c6035 /avahi-daemon/dbus-protocol.c | |
| parent | 740bc001fb647255709b5385d5a8a19781722097 (diff) | |
* avahi-utils: replace python avahi-browse with a version written in C.
* remove -Wunused from GCC command line and use "unused" attribute instead
* remove AVAHI_CLIENT_S_FAILURE and AVAHI_CLIENT_S_INVALID since these event's are never forwarded to the client anyway
* make use of AVAHI_GCC_NORETURN
* really send eror code with StateChange DBUS signals
* ignore EINTR in avahi_simple_poll_loop()
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@879 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/dbus-protocol.c')
| -rw-r--r-- | avahi-daemon/dbus-protocol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index 0b1a6e8..8bb4a4d 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -627,7 +627,7 @@ fail: } -static DBusHandlerResult msg_signal_filter_impl(DBusConnection *c, DBusMessage *m, void *userdata) { +static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection *c, DBusMessage *m, void *userdata) { DBusError error; dbus_error_init(&error); @@ -1733,7 +1733,7 @@ fail: return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void *userdata) { +static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) { DBusError error; dbus_error_init(&error); @@ -2439,7 +2439,7 @@ void dbus_protocol_server_state_changed(AvahiServerState state) { else e = AVAHI_DBUS_ERR_OK; - dbus_message_append_args(m, DBUS_TYPE_INT32, &t, DBUS_TYPE_INVALID); + dbus_message_append_args(m, DBUS_TYPE_INT32, &t, DBUS_TYPE_STRING, &e, DBUS_TYPE_INVALID); dbus_connection_send(server->bus, m, NULL); dbus_message_unref(m); } |