[xiph-commits] r8481 - icecast/trunk/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-12-17 16:11:56 -0800 (Fri, 17 Dec 2004)
New Revision: 8481

Modified:
   icecast/trunk/icecast/src/format.c
   icecast/trunk/icecast/src/fserve.c
Log:
minor type cleanup in fserve, include correct header for ogg


Modified: icecast/trunk/icecast/src/format.c
===================================================================
--- icecast/trunk/icecast/src/format.c	2004-12-17 21:05:20 UTC (rev 8480)
+++ icecast/trunk/icecast/src/format.c	2004-12-18 00:11:56 UTC (rev 8481)
@@ -36,7 +36,7 @@
 #include "global.h"
 #include "httpp/httpp.h"
 
-#include "format_vorbis.h"
+#include "format_ogg.h"
 #include "format_mp3.h"
 
 #include "logging.h"

Modified: icecast/trunk/icecast/src/fserve.c
===================================================================
--- icecast/trunk/icecast/src/fserve.c	2004-12-17 21:05:20 UTC (rev 8480)
+++ icecast/trunk/icecast/src/fserve.c	2004-12-18 00:11:56 UTC (rev 8481)
@@ -88,7 +88,7 @@
 static int _free_client(void *key);
 static int _delete_mapping(void *mapping);
 static void *fserv_thread_function(void *arg);
-static void create_mime_mappings(char *fn);
+static void create_mime_mappings(const char *fn);
 
 void fserve_initialize(void)
 {
@@ -314,7 +314,7 @@
     return NULL;
 }
 
-static char *fserve_content_type(char *path)
+static const char *fserve_content_type(char *path)
 {
     char *ext = util_get_extension(path);
     mime_type exttype = {ext, NULL};
@@ -528,7 +528,7 @@
             ((mime_type *)b)->ext);
 }
 
-static void create_mime_mappings(char *fn) {
+static void create_mime_mappings(const char *fn) {
     FILE *mimefile = fopen(fn, "r");
     char line[4096];
     char *type, *ext, *cur;