oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

zeroconf: avoid mixing declarations and code

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@5243 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong 2007-01-14 02:08:09 +00:00
parent 8a38b28e86
commit 931c980558
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/zeroconf.c
View File

@ -372,8 +372,9 @@ static int avahiFdset( fd_set* rfds, fd_set* wfds, fd_set* efds )
static int avahiFdconsume( int fdCount, fd_set* rfds, fd_set* wfds, fd_set* efds ) static int avahiFdconsume( int fdCount, fd_set* rfds, fd_set* wfds, fd_set* efds )
{ {
int retval = fdCount; int retval = fdCount;
AvahiTimeout* t;
AvahiWatch* w = avahiWatchList; AvahiWatch* w = avahiWatchList;
while( w != NULL && retval > 0 ) { while( w != NULL && retval > 0 ) {
AvahiWatch* current = w; AvahiWatch* current = w;
current->observedEvent = 0; current->observedEvent = 0;
@ -404,7 +405,7 @@ static int avahiFdconsume( int fdCount, fd_set* rfds, fd_set* wfds, fd_set* efds
} }
} }
AvahiTimeout* t = avahiTimeoutList; t = avahiTimeoutList;
while( t != NULL && avahiRunning ) { while( t != NULL && avahiRunning ) {
AvahiTimeout* current = t; AvahiTimeout* current = t;
@ -418,19 +419,8 @@ static int avahiFdconsume( int fdCount, fd_set* rfds, fd_set* wfds, fd_set* efds
return retval; return retval;
} }
#endif // HAVE_AVAHI static void init_avahi(const char *serviceName)
void initZeroconf(void)
{ {
const char* serviceName = SERVICE_NAME;
ConfigParam *param;
param = getConfigParam(CONF_ZEROCONF_NAME);
if (param && strlen(param->value) > 0)
serviceName = param->value;
#if HAVE_AVAHI
int error; int error;
DEBUG( "Avahi: Initializing interface\n" ); DEBUG( "Avahi: Initializing interface\n" );
@ -468,7 +458,21 @@ void initZeroconf(void)
fail: fail:
finishZeroconf(); finishZeroconf();
#endif // HAVE_AVAHI }
#else /* !HAVE_AVAHI */
static void init_avahi(const char *serviceName) { }
#endif /* HAVE_AVAHI */
void initZeroconf(void)
{
const char* serviceName = SERVICE_NAME;
ConfigParam *param;
param = getConfigParam(CONF_ZEROCONF_NAME);
if (param && strlen(param->value) > 0)
serviceName = param->value;
init_avahi(serviceName);
} }
void finishZeroconf(void) void finishZeroconf(void)