Commit f0e7a859 authored by Karl Heyes's avatar Karl Heyes

minor type cleanup in fserve, include correct header for ogg

svn path=/icecast/trunk/icecast/; revision=8481
parent e59095b1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "global.h" #include "global.h"
#include "httpp/httpp.h" #include "httpp/httpp.h"
#include "format_vorbis.h" #include "format_ogg.h"
#include "format_mp3.h" #include "format_mp3.h"
#include "logging.h" #include "logging.h"
......
...@@ -88,7 +88,7 @@ typedef struct { ...@@ -88,7 +88,7 @@ typedef struct {
static int _free_client(void *key); static int _free_client(void *key);
static int _delete_mapping(void *mapping); static int _delete_mapping(void *mapping);
static void *fserv_thread_function(void *arg); 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) void fserve_initialize(void)
{ {
...@@ -314,7 +314,7 @@ static void *fserv_thread_function(void *arg) ...@@ -314,7 +314,7 @@ static void *fserv_thread_function(void *arg)
return NULL; return NULL;
} }
static char *fserve_content_type(char *path) static const char *fserve_content_type(char *path)
{ {
char *ext = util_get_extension(path); char *ext = util_get_extension(path);
mime_type exttype = {ext, NULL}; mime_type exttype = {ext, NULL};
...@@ -528,7 +528,7 @@ static int _compare_mappings(void *arg, void *a, void *b) ...@@ -528,7 +528,7 @@ static int _compare_mappings(void *arg, void *a, void *b)
((mime_type *)b)->ext); ((mime_type *)b)->ext);
} }
static void create_mime_mappings(char *fn) { static void create_mime_mappings(const char *fn) {
FILE *mimefile = fopen(fn, "r"); FILE *mimefile = fopen(fn, "r");
char line[4096]; char line[4096];
char *type, *ext, *cur; char *type, *ext, *cur;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment