mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-12-04 14:46:30 -05:00
minor type cleanup in fserve, include correct header for ogg
svn path=/icecast/trunk/icecast/; revision=8481
This commit is contained in:
parent
e59095b11a
commit
f0e7a859ab
@ -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 {
|
|||||||
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)
|
|||||||
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)
|
|||||||
((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;
|
||||||
|
Loading…
Reference in New Issue
Block a user