diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:41 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:41 -0700 |
| commit | c36029fc806cf083de3aaf1344d6bd2be8db316f (patch) | |
| tree | da88b1f073b8125d764b94b924492d2b05ea4c69 /src/zeroconf.c | |
| parent | aa0755f53545fcf343f791f04760f6b934e022e4 (diff) | |
| parent | 6982a829e22d2bc7cf7c829c4430a4ea6f5bc7fa (diff) | |
| download | mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.tar.gz mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.tar.xz mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.zip | |
Merge branch 'mk/cleanups'
* mk/cleanups: (60 commits)
pass constant pointers
const pointers
unsigned integers and size_t
oggflac: fix GCC warnings
include cleanup
protect locate.h from double inclusion
playlist: eliminate unused fd parameters
jack: made "sample_size" static const
moved jack configuration to the JackData struct
jack: removed unused macros
jack: don't set audioOutput->data=NULL
jack: initialize JackData in jack_initDriver()
jack: added freeJackClient()
jack: initialize jd->client after !jd check
jack: eliminate superfluous freeJackData() calls
mp3: converted the MUTEFRAME_ macros to an enum
mp3: converted the DECODE_ constants to an enum
wavpack: don't use "isp" before initialization
wavpack: moved code to wavpack_open_wvc()
simplified code in the ogg decoder plugin
...
Diffstat (limited to 'src/zeroconf.c')
| -rw-r--r-- | src/zeroconf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/zeroconf.c b/src/zeroconf.c index 421a037b8..e6cbb4287 100644 --- a/src/zeroconf.c +++ b/src/zeroconf.c @@ -94,7 +94,7 @@ struct AvahiTimeout { static AvahiWatch *avahiWatchList; static AvahiTimeout *avahiTimeoutList; -static AvahiWatch *avahiWatchNew(const AvahiPoll * api, int fd, +static AvahiWatch *avahiWatchNew(mpd_unused const AvahiPoll * api, int fd, AvahiWatchEvent event, AvahiWatchCallback callback, void *userdata) { @@ -177,7 +177,7 @@ static void avahiTimeoutFree(AvahiTimeout * t) free(t); } -static AvahiTimeout *avahiTimeoutNew(const AvahiPoll * api, +static AvahiTimeout *avahiTimeoutNew(mpd_unused const AvahiPoll * api, const struct timeval *tv, AvahiTimeoutCallback callback, void *userdata) @@ -201,7 +201,8 @@ static AvahiTimeout *avahiTimeoutNew(const AvahiPoll * api, /* Callback when the EntryGroup changes state */ static void avahiGroupCallback(AvahiEntryGroup * g, - AvahiEntryGroupState state, void *userdata) + AvahiEntryGroupState state, + mpd_unused void *userdata) { char *n; assert(g); @@ -291,7 +292,7 @@ fail: /* Callback when avahi changes state */ static void avahiClientCallback(AvahiClient * c, AvahiClientState state, - void *userdata) + mpd_unused void *userdata) { int reason; assert(c); |