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/main.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/main.c')
| -rw-r--r-- | avahi-daemon/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index cf87e23..8d1a496 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -230,7 +230,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda avahi_server = s; #ifdef HAVE_DBUS - if (c->enable_dbus) + if (c->enable_dbus && state != AVAHI_SERVER_INVALID && state != AVAHI_SERVER_FAILURE) dbus_protocol_server_state_changed(state); #endif @@ -556,11 +556,11 @@ static void log_function(AvahiLogLevel level, const char *txt) { daemon_log(log_level_map[level], "%s", txt); } -static void dump(const char *text, void* userdata) { +static void dump(const char *text, AVAHI_GCC_UNUSED void* userdata) { avahi_log_info("%s", text); } -static void signal_callback(AvahiWatch *watch, int fd, AvahiWatchEvent event, void *userdata) { +static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) { int sig; const AvahiPoll *poll_api; |