1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00

minor cleanup

svn path=/trunk/icecast/; revision=5795
This commit is contained in:
Karl Heyes 2004-01-29 23:23:53 +00:00
parent c90fb2ea55
commit d7dc5d327c
2 changed files with 8 additions and 8 deletions

View File

@ -10,7 +10,7 @@ AM_MAINTAINER_MODE
AC_PROG_CC AC_PROG_CC
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_PROG_LIBTOOL AC_PROG_LIBTOOL
dnl Set some options based on environment dnl Set some options based on environment
@ -81,8 +81,10 @@ XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$PTHREAD_CPPFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS],[$PTHREAD_LIBS]) XIPH_VAR_PREPEND([XIPH_LIBS],[$PTHREAD_LIBS])
dnl -- YP support -- dnl -- YP support --
AC_ARG_ENABLE([yp], AC_HELP_STRING([--disable-yp],[disable YP directory support]),, AC_ARG_ENABLE([yp],
[enable_yp="yes"]) AC_HELP_STRING([--disable-yp],[disable YP directory support]),
enable_yp="$enableval",
enable_yp="yes")
if test "x$enable_yp" = "xyes" if test "x$enable_yp" = "xyes"
then then
XIPH_PATH_CURL([ XIPH_PATH_CURL([

View File

@ -1029,13 +1029,13 @@ static void *_handle_connection(void *arg)
else if(httpp_parse_icy(parser, header, strlen(header))) { else if(httpp_parse_icy(parser, header, strlen(header))) {
/* TODO: Map incoming icy connections to /icy_0, etc. */ /* TODO: Map incoming icy connections to /icy_0, etc. */
char mount[20]; char mount[20];
int i = 0; unsigned i = 0;
strcpy(mount, "/"); strcpy(mount, "/");
avl_tree_rlock(global.source_tree); avl_tree_rlock(global.source_tree);
while(source_find_mount(mount) != NULL) { while (source_find_mount (mount) != NULL) {
sprintf(mount, "/icy_%d", i++); snprintf (mount, sizeof (mount), "/icy_%u", i++);
} }
avl_tree_unlock(global.source_tree); avl_tree_unlock(global.source_tree);
@ -1050,8 +1050,6 @@ static void *_handle_connection(void *arg)
} }
} }
thread_exit(0);
return NULL; return NULL;
} }