Added support for oldstyle id3 genres.

[vlc] / modules / misc / httpd.c

diff --git a/modules/misc/httpd.c b/modules/misc/httpd.c
index ed758d30c296890d21a1eef95a6d27f2685cbf8a..87f859c6ba7dfb9008ccf9f743bf726e00ca1ffa 100644 (file)
--- a/modules/misc/httpd.c
+++ b/modules/misc/httpd.c
@@ -2,7 +2,7 @@
  * httpd.c
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.c,v 1.4 2003/02/27 15:07:48 fenrir Exp $
+ * $Id: httpd.c,v 1.7 2003/03/06 11:09:56 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -26,7 +26,6 @@
  *****************************************************************************/
 #include <stdlib.h>
 
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -37,10 +36,12 @@
 #include <vlc/vlc.h>
 #include "httpd.h"
 
+#ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
-#   include <io.h>
 #endif
 
 #if defined( UNDER_CE )
@@ -437,7 +438,7 @@ static httpd_host_t *_RegisterHost( httpd_sys_t *p_httpt, char *psz_host_addr, i
         /* yes, increment ref count and succed */
         p_httpt->host[i]->i_ref++;
         vlc_mutex_unlock( &p_httpt->host_lock );
-        return NULL;
+        return( p_httpt->host[i] );
     }
 
     /* need to add a new listening socket */
@@ -1202,7 +1203,7 @@ static void b64_decode( char *dest, char *src )
         -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1   /* F0-FF */
         };
 
-    for( i_level = 0; *src != '\0' > 0; src++ )
+    for( i_level = 0; *src != '\0'; src++ )
     {
         int  c;