diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-06-22 23:09:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-06-22 23:09:46 +0200 |
| commit | fc33f7ee97da6a8b7263620775b7b74b4c754402 (patch) | |
| tree | 519635b1f72acc7613b4b7c4ad70fbc39ab3901b /src/pulsecore/avahi-wrap.c | |
| parent | 048e576a6dfe2bfe62fa33c74c30cc34057ee740 (diff) | |
| parent | e4d914c945c13d23b131d7ba75fbdd03cb6d0043 (diff) | |
Merge most of elmarco/rtclock2
Merge commit 'e4d914c945c13d23b131d7ba75fbdd03cb6d0043'
Diffstat (limited to 'src/pulsecore/avahi-wrap.c')
| -rw-r--r-- | src/pulsecore/avahi-wrap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/pulsecore/avahi-wrap.c b/src/pulsecore/avahi-wrap.c index 56d9d3dd..f1f08bcc 100644 --- a/src/pulsecore/avahi-wrap.c +++ b/src/pulsecore/avahi-wrap.c @@ -23,6 +23,7 @@ #include <config.h> #endif +#include <pulse/timeval.h> #include <pulse/xmalloc.h> #include <pulsecore/log.h> @@ -116,14 +117,13 @@ struct AvahiTimeout { void *userdata; }; -static void timeout_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *tv, void *userdata) { - AvahiTimeout *t = userdata; +static void timeout_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *t, void *userdata) { + AvahiTimeout *to = userdata; pa_assert(a); pa_assert(e); - pa_assert(t); - t->callback(t, t->userdata); + to->callback(to, to->userdata); } static AvahiTimeout* timeout_new(const AvahiPoll *api, const struct timeval *tv, AvahiTimeoutCallback callback, void *userdata) { @@ -145,6 +145,7 @@ static AvahiTimeout* timeout_new(const AvahiPoll *api, const struct timeval *tv, } static void timeout_update(AvahiTimeout *t, const struct timeval *tv) { + pa_assert(t); if (t->time_event && tv) |