[xiph-commits] r10615 - icecast/trunk/icecast/src
msmith at svn.xiph.org
msmith at svn.xiph.org
Sat Dec 17 04:23:18 PST 2005
Author: msmith
Date: 2005-12-17 04:23:09 -0800 (Sat, 17 Dec 2005)
New Revision: 10615
Modified:
icecast/trunk/icecast/src/auth.c
icecast/trunk/icecast/src/auth.h
icecast/trunk/icecast/src/cfgfile.c
icecast/trunk/icecast/src/connection.c
icecast/trunk/icecast/src/fserve.c
icecast/trunk/icecast/src/main.c
icecast/trunk/icecast/src/stats.c
icecast/trunk/icecast/src/stats.h
icecast/trunk/icecast/src/xslt.c
icecast/trunk/icecast/src/xslt.h
icecast/trunk/icecast/src/yp.c
icecast/trunk/icecast/src/yp.h
Log:
Patch from gtgbr at gmx.net to fix (void) function prototypes, with some minor
changes.
Modified: icecast/trunk/icecast/src/auth.c
===================================================================
--- icecast/trunk/icecast/src/auth.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/auth.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -580,7 +580,7 @@
/* these are called at server start and termination */
-void auth_initialise ()
+void auth_initialise (void)
{
clients_to_auth = NULL;
auth_pending_count = 0;
@@ -589,7 +589,7 @@
auth_thread = thread_create ("auth thread", auth_run_thread, NULL, THREAD_ATTACHED);
}
-void auth_shutdown ()
+void auth_shutdown (void)
{
if (auth_thread)
{
Modified: icecast/trunk/icecast/src/auth.h
===================================================================
--- icecast/trunk/icecast/src/auth.h 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/auth.h 2005-12-17 12:23:09 UTC (rev 10615)
@@ -77,8 +77,8 @@
void add_client (const char *mount, client_t *client);
int release_client (client_t *client);
-void auth_initialise ();
-void auth_shutdown ();
+void auth_initialise (void);
+void auth_shutdown (void);
auth_t *auth_get_authenticator (xmlNodePtr node);
void auth_release (auth_t *authenticator);
Modified: icecast/trunk/icecast/src/cfgfile.c
===================================================================
--- icecast/trunk/icecast/src/cfgfile.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/cfgfile.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -86,12 +86,12 @@
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_rwlock_create(&_locks.config_lock);
}
-static void release_locks() {
+static void release_locks(void) {
thread_mutex_destroy(&_locks.relay_lock);
thread_rwlock_destroy(&_locks.config_lock);
}
Modified: icecast/trunk/icecast/src/connection.c
===================================================================
--- icecast/trunk/icecast/src/connection.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/connection.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -313,7 +313,7 @@
/* 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;
ice_config_t *config = config_get_config ();
Modified: icecast/trunk/icecast/src/fserve.c
===================================================================
--- icecast/trunk/icecast/src/fserve.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/fserve.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -201,7 +201,7 @@
}
#endif
-static void wait_for_fds() {
+static void wait_for_fds(void) {
fserve_t *fclient;
while (run_fserv)
Modified: icecast/trunk/icecast/src/main.c
===================================================================
--- icecast/trunk/icecast/src/main.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/main.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -75,7 +75,7 @@
#endif
}
-static void _print_usage()
+static void _print_usage(void)
{
printf(ICECAST_VERSION_STRING "\n\n");
printf("usage: icecast [-b -v] -c <file>\n");
Modified: icecast/trunk/icecast/src/stats.c
===================================================================
--- icecast/trunk/icecast/src/stats.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/stats.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -119,7 +119,7 @@
thread_mutex_unlock(&_global_event_mutex);
}
-void stats_initialize()
+void stats_initialize(void)
{
_event_listeners = NULL;
@@ -139,7 +139,7 @@
_stats_thread_id = thread_create("Stats Thread", _stats_thread, NULL, THREAD_ATTACHED);
}
-void stats_shutdown()
+void stats_shutdown(void)
{
int n;
@@ -182,7 +182,7 @@
}
}
-stats_t *stats_get_stats()
+stats_t *stats_get_stats(void)
{
/* lock global stats
Modified: icecast/trunk/icecast/src/stats.h
===================================================================
--- icecast/trunk/icecast/src/stats.h 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/stats.h 2005-12-17 12:23:09 UTC (rev 10615)
@@ -70,10 +70,10 @@
} stats_t;
-void stats_initialize();
-void stats_shutdown();
+void stats_initialize(void);
+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_args(const char *source, char *name, char *format, ...);
Modified: icecast/trunk/icecast/src/xslt.c
===================================================================
--- icecast/trunk/icecast/src/xslt.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/xslt.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -94,7 +94,7 @@
static stylesheet_cache_t cache[CACHESIZE];
static mutex_t xsltlock;
-void xslt_initialize()
+void xslt_initialize(void)
{
xmlSubstituteEntitiesDefault(1);
xmlLoadExtDtdDefaultValue = 1;
@@ -105,7 +105,7 @@
xmlLoadExtDtdDefaultValue = 1;
}
-void xslt_shutdown() {
+void xslt_shutdown(void) {
int i;
for(i=0; i < CACHESIZE; i++) {
@@ -119,7 +119,7 @@
xsltCleanupGlobals();
}
-static int evict_cache_entry() {
+static int evict_cache_entry(void) {
int i, age=0, oldest=0;
for(i=0; i < CACHESIZE; i++) {
Modified: icecast/trunk/icecast/src/xslt.h
===================================================================
--- icecast/trunk/icecast/src/xslt.h 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/xslt.h 2005-12-17 12:23:09 UTC (rev 10615)
@@ -35,6 +35,6 @@
void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client);
-void xslt_initialize();
-void xslt_shutdown();
+void xslt_initialize(void);
+void xslt_shutdown(void);
Modified: icecast/trunk/icecast/src/yp.c
===================================================================
--- icecast/trunk/icecast/src/yp.c 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/yp.c 2005-12-17 12:23:09 UTC (rev 10615)
@@ -265,7 +265,7 @@
}
-void yp_initialize()
+void yp_initialize(void)
{
ice_config_t *config = config_get_config();
thread_rwlock_create (&yp_lock);
@@ -562,7 +562,7 @@
/* 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,
**server_p = (struct yp_server **)&active_yps;
@@ -916,7 +916,7 @@
}
-void yp_shutdown ()
+void yp_shutdown (void)
{
yp_running = 0;
yp_update = 1;
Modified: icecast/trunk/icecast/src/yp.h
===================================================================
--- icecast/trunk/icecast/src/yp.h 2005-12-17 12:18:18 UTC (rev 10614)
+++ icecast/trunk/icecast/src/yp.h 2005-12-17 12:23:09 UTC (rev 10615)
@@ -32,8 +32,8 @@
void yp_remove (const char *mount);
void yp_touch (const char *mount);
void yp_recheck_config (ice_config_t *config);
-void yp_initialize();
-void yp_shutdown();
+void yp_initialize(void);
+void yp_shutdown(void);
#else
More information about the commits
mailing list