[xiph-cvs] cvs commit: icecast/src connection.c

[Karl Heyes]

karl        04/01/29 18:23:53

  Modified:    .        configure.in
               src      connection.c
  Log:
  minor cleanup

Revision  Changes    Path
1.45      +5 -3      icecast/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- configure.in	26 Jan 2004 21:49:07 -0000	1.44
+++ configure.in	29 Jan 2004 23:23:52 -0000	1.45
@@ -10,7 +10,7 @@
 
 AC_PROG_CC
 AC_CANONICAL_HOST
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl Set some options based on environment
 
@@ -81,8 +81,10 @@
 XIPH_VAR_PREPEND([XIPH_LIBS],[$PTHREAD_LIBS])
 
 dnl -- YP support --
-AC_ARG_ENABLE([yp], AC_HELP_STRING([--disable-yp],[disable YP directory support]),,
-        [enable_yp="yes"])
+AC_ARG_ENABLE([yp],
+        AC_HELP_STRING([--disable-yp],[disable YP directory support]),
+        enable_yp="$enableval",
+        enable_yp="yes")
 if test "x$enable_yp" = "xyes"
 then
 XIPH_PATH_CURL([

<p><p>1.84      +3 -5      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- connection.c	29 Jan 2004 16:46:54 -0000	1.83
+++ connection.c	29 Jan 2004 23:23:53 -0000	1.84
@@ -1029,13 +1029,13 @@
             else if(httpp_parse_icy(parser, header, strlen(header))) {
                 /* TODO: Map incoming icy connections to /icy_0, etc. */
                 char mount[20];
-                int i = 0;
+                unsigned i = 0;
 
                 strcpy(mount, "/");
 
                 avl_tree_rlock(global.source_tree);
-                while(source_find_mount(mount) != NULL) {
-                    sprintf(mount, "/icy_%d", i++);
+                while (source_find_mount (mount) != NULL) {
+                    snprintf (mount, sizeof (mount), "/icy_%u", i++);
                 }
                 avl_tree_unlock(global.source_tree);
 
@@ -1050,8 +1050,6 @@
         }
     }
 
-    thread_exit(0);
-
     return NULL;
 }
 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.