mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-09-29 04:25:55 -04:00
Patch from gtgbr@gmx.net to fix (void) function prototypes, with some minor
changes. svn path=/icecast/trunk/icecast/; revision=10615
This commit is contained in:
parent
4c3d56743d
commit
37a6bb18d6
@ -580,7 +580,7 @@ void auth_stream_end (mount_proxy *mountinfo, const char *mount)
|
|||||||
|
|
||||||
/* these are called at server start and termination */
|
/* these are called at server start and termination */
|
||||||
|
|
||||||
void auth_initialise ()
|
void auth_initialise (void)
|
||||||
{
|
{
|
||||||
clients_to_auth = NULL;
|
clients_to_auth = NULL;
|
||||||
auth_pending_count = 0;
|
auth_pending_count = 0;
|
||||||
@ -589,7 +589,7 @@ void auth_initialise ()
|
|||||||
auth_thread = thread_create ("auth thread", auth_run_thread, NULL, THREAD_ATTACHED);
|
auth_thread = thread_create ("auth thread", auth_run_thread, NULL, THREAD_ATTACHED);
|
||||||
}
|
}
|
||||||
|
|
||||||
void auth_shutdown ()
|
void auth_shutdown (void)
|
||||||
{
|
{
|
||||||
if (auth_thread)
|
if (auth_thread)
|
||||||
{
|
{
|
||||||
|
@ -77,8 +77,8 @@ typedef struct auth_tag
|
|||||||
void add_client (const char *mount, client_t *client);
|
void add_client (const char *mount, client_t *client);
|
||||||
int release_client (client_t *client);
|
int release_client (client_t *client);
|
||||||
|
|
||||||
void auth_initialise ();
|
void auth_initialise (void);
|
||||||
void auth_shutdown ();
|
void auth_shutdown (void);
|
||||||
|
|
||||||
auth_t *auth_get_authenticator (xmlNodePtr node);
|
auth_t *auth_get_authenticator (xmlNodePtr node);
|
||||||
void auth_release (auth_t *authenticator);
|
void auth_release (auth_t *authenticator);
|
||||||
|
@ -86,12 +86,12 @@ static void _parse_listen_socket(xmlDocPtr doc, xmlNodePtr node,
|
|||||||
ice_config_t *c);
|
ice_config_t *c);
|
||||||
static void _add_server(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
static void _add_server(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
||||||
|
|
||||||
static void create_locks() {
|
static void create_locks(void) {
|
||||||
thread_mutex_create(&_locks.relay_lock);
|
thread_mutex_create(&_locks.relay_lock);
|
||||||
thread_rwlock_create(&_locks.config_lock);
|
thread_rwlock_create(&_locks.config_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void release_locks() {
|
static void release_locks(void) {
|
||||||
thread_mutex_destroy(&_locks.relay_lock);
|
thread_mutex_destroy(&_locks.relay_lock);
|
||||||
thread_rwlock_destroy(&_locks.config_lock);
|
thread_rwlock_destroy(&_locks.config_lock);
|
||||||
}
|
}
|
||||||
|
@ -313,7 +313,7 @@ static client_queue_t *_get_connection(void)
|
|||||||
|
|
||||||
|
|
||||||
/* run along queue checking for any data that has come in or a timeout */
|
/* run along queue checking for any data that has come in or a timeout */
|
||||||
static void process_request_queue ()
|
static void process_request_queue (void)
|
||||||
{
|
{
|
||||||
client_queue_t **node_ref = (client_queue_t **)&_req_queue;
|
client_queue_t **node_ref = (client_queue_t **)&_req_queue;
|
||||||
ice_config_t *config = config_get_config ();
|
ice_config_t *config = config_get_config ();
|
||||||
|
@ -201,7 +201,7 @@ int fserve_client_waiting (void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void wait_for_fds() {
|
static void wait_for_fds(void) {
|
||||||
fserve_t *fclient;
|
fserve_t *fclient;
|
||||||
|
|
||||||
while (run_fserv)
|
while (run_fserv)
|
||||||
|
@ -75,7 +75,7 @@ static void _fatal_error(char *perr)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _print_usage()
|
static void _print_usage(void)
|
||||||
{
|
{
|
||||||
printf(ICECAST_VERSION_STRING "\n\n");
|
printf(ICECAST_VERSION_STRING "\n\n");
|
||||||
printf("usage: icecast [-b -v] -c <file>\n");
|
printf("usage: icecast [-b -v] -c <file>\n");
|
||||||
|
@ -119,7 +119,7 @@ static void queue_global_event (stats_event_t *event)
|
|||||||
thread_mutex_unlock(&_global_event_mutex);
|
thread_mutex_unlock(&_global_event_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void stats_initialize()
|
void stats_initialize(void)
|
||||||
{
|
{
|
||||||
_event_listeners = NULL;
|
_event_listeners = NULL;
|
||||||
|
|
||||||
@ -139,7 +139,7 @@ void stats_initialize()
|
|||||||
_stats_thread_id = thread_create("Stats Thread", _stats_thread, NULL, THREAD_ATTACHED);
|
_stats_thread_id = thread_create("Stats Thread", _stats_thread, NULL, THREAD_ATTACHED);
|
||||||
}
|
}
|
||||||
|
|
||||||
void stats_shutdown()
|
void stats_shutdown(void)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ void stats_shutdown()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stats_t *stats_get_stats()
|
stats_t *stats_get_stats(void)
|
||||||
{
|
{
|
||||||
/* lock global stats
|
/* lock global stats
|
||||||
|
|
||||||
|
@ -70,10 +70,10 @@ typedef struct _stats_tag
|
|||||||
|
|
||||||
} stats_t;
|
} stats_t;
|
||||||
|
|
||||||
void stats_initialize();
|
void stats_initialize(void);
|
||||||
void stats_shutdown();
|
void stats_shutdown(void);
|
||||||
|
|
||||||
stats_t *stats_get_stats();
|
stats_t *stats_get_stats(void);
|
||||||
|
|
||||||
void stats_event(const char *source, const char *name, const char *value);
|
void stats_event(const char *source, const char *name, const char *value);
|
||||||
void stats_event_args(const char *source, char *name, char *format, ...);
|
void stats_event_args(const char *source, char *name, char *format, ...);
|
||||||
|
@ -94,7 +94,7 @@ int xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, xmlDocPtr r
|
|||||||
static stylesheet_cache_t cache[CACHESIZE];
|
static stylesheet_cache_t cache[CACHESIZE];
|
||||||
static mutex_t xsltlock;
|
static mutex_t xsltlock;
|
||||||
|
|
||||||
void xslt_initialize()
|
void xslt_initialize(void)
|
||||||
{
|
{
|
||||||
xmlSubstituteEntitiesDefault(1);
|
xmlSubstituteEntitiesDefault(1);
|
||||||
xmlLoadExtDtdDefaultValue = 1;
|
xmlLoadExtDtdDefaultValue = 1;
|
||||||
@ -105,7 +105,7 @@ void xslt_initialize()
|
|||||||
xmlLoadExtDtdDefaultValue = 1;
|
xmlLoadExtDtdDefaultValue = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void xslt_shutdown() {
|
void xslt_shutdown(void) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i=0; i < CACHESIZE; i++) {
|
for(i=0; i < CACHESIZE; i++) {
|
||||||
@ -119,7 +119,7 @@ void xslt_shutdown() {
|
|||||||
xsltCleanupGlobals();
|
xsltCleanupGlobals();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int evict_cache_entry() {
|
static int evict_cache_entry(void) {
|
||||||
int i, age=0, oldest=0;
|
int i, age=0, oldest=0;
|
||||||
|
|
||||||
for(i=0; i < CACHESIZE; i++) {
|
for(i=0; i < CACHESIZE; i++) {
|
||||||
|
@ -35,6 +35,6 @@
|
|||||||
|
|
||||||
|
|
||||||
void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client);
|
void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client);
|
||||||
void xslt_initialize();
|
void xslt_initialize(void);
|
||||||
void xslt_shutdown();
|
void xslt_shutdown(void);
|
||||||
|
|
||||||
|
6
src/yp.c
6
src/yp.c
@ -265,7 +265,7 @@ void yp_recheck_config (ice_config_t *config)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void yp_initialize()
|
void yp_initialize(void)
|
||||||
{
|
{
|
||||||
ice_config_t *config = config_get_config();
|
ice_config_t *config = config_get_config();
|
||||||
thread_rwlock_create (&yp_lock);
|
thread_rwlock_create (&yp_lock);
|
||||||
@ -562,7 +562,7 @@ static ypdata_t *create_yp_entry (const char *mount)
|
|||||||
|
|
||||||
|
|
||||||
/* Check for changes in the YP servers configured */
|
/* Check for changes in the YP servers configured */
|
||||||
static void check_servers ()
|
static void check_servers (void)
|
||||||
{
|
{
|
||||||
struct yp_server *server = (struct yp_server *)active_yps,
|
struct yp_server *server = (struct yp_server *)active_yps,
|
||||||
**server_p = (struct yp_server **)&active_yps;
|
**server_p = (struct yp_server **)&active_yps;
|
||||||
@ -916,7 +916,7 @@ void yp_touch (const char *mount)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void yp_shutdown ()
|
void yp_shutdown (void)
|
||||||
{
|
{
|
||||||
yp_running = 0;
|
yp_running = 0;
|
||||||
yp_update = 1;
|
yp_update = 1;
|
||||||
|
4
src/yp.h
4
src/yp.h
@ -32,8 +32,8 @@ void yp_add (const char *mount);
|
|||||||
void yp_remove (const char *mount);
|
void yp_remove (const char *mount);
|
||||||
void yp_touch (const char *mount);
|
void yp_touch (const char *mount);
|
||||||
void yp_recheck_config (ice_config_t *config);
|
void yp_recheck_config (ice_config_t *config);
|
||||||
void yp_initialize();
|
void yp_initialize(void);
|
||||||
void yp_shutdown();
|
void yp_shutdown(void);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user