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-common/simple-watch.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-common/simple-watch.c')
| -rw-r--r-- | avahi-common/simple-watch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c index 3633521..65d9d18 100644 --- a/avahi-common/simple-watch.c +++ b/avahi-common/simple-watch.c @@ -619,7 +619,7 @@ const AvahiPoll* avahi_simple_poll_get(AvahiSimplePoll *s) { return &s->api; } -static int system_poll(struct pollfd *ufds, unsigned int nfds, int timeout, void *userdata) { +static int system_poll(struct pollfd *ufds, unsigned int nfds, int timeout, AVAHI_GCC_UNUSED void *userdata) { return poll(ufds, nfds, timeout); } @@ -640,5 +640,6 @@ int avahi_simple_poll_loop(AvahiSimplePoll *s) { for (;;) if ((r = avahi_simple_poll_iterate(s, -1)) != 0) - return r; + if (r >= 0 || errno != EINTR) + return r; } |