avahi: more sparse fixes (-Wshadow, non-ANSI declarations)

git-svn-id: https://svn.musicpd.org/mpd/trunk@5248 09075e82-0dd4-0310-85a5-a0d7c8717e4f

2 files changed, 9 insertions, 9 deletions

diff --git a/src/interface.c b/src/interface.c
index 1e6fb4445..4c2190783 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -512,15 +512,15 @@ int doIOForInterfaces(void)
 
 		// Add fds for all registered IO handlers
 		if( ioList ) {
-			struct ioOps *i = ioList;
-			while( i ) {
-				struct ioOps *current = i;
+			struct ioOps *o = ioList;
+			while( o ) {
+				struct ioOps *current = o;
 				int fdnum;
 				assert( current->fdset );
 				fdnum = current->fdset( &rfds, &wfds, &efds );
 				if( fdmax < fdnum )
 					fdmax = fdnum;
-				i = i->next;
+				o = o->next;
 			}
 		}
 
@@ -531,12 +531,12 @@ int doIOForInterfaces(void)
 
 		// Consume fds for all registered IO handlers
 		if( ioList ) {
-			struct ioOps *i = ioList;
-			while( i ) {
-				struct ioOps *current = i;
+			struct ioOps *o = ioList;
+			while( o ) {
+				struct ioOps *current = o;
 				assert( current->consume );
 				selret = current->consume( selret, &rfds, &wfds, &efds );
-				i = i->next;
+				o = o->next;
 			}
 		}
 
diff --git a/src/listen.c b/src/listen.c
index 4caf2dc2a..6a8d55388 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -270,7 +270,7 @@ void getConnections(fd_set * fds)
 	}
 }
 
-int getBoundPort()
+int getBoundPort(void)
 {
 	return boundPort;
 }