aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-22 04:15:54 -04:00
Code

rename ICE_LISTEN_QUEUE, ICE_RUNNING and ICE_HALTING so they have a prefix of ICECAST_

Browse Source 
svn path=/icecast/trunk/icecast/; revision=19258
This commit is contained in:
Philipp Schafft 2014-10-31 09:00:45 +00:00
parent 2b7cb1c641
commit e6ce60e630
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/connection.c
View File

@ -713,7 +713,7 @@ void connection_accept_loop (void)
get_ssl_certificate (config);
config_release_config ();
while (global.running == ICE_RUNNING)
while (global.running == ICECAST_RUNNING)
{
con = _accept_connection (duration);
@ -1434,7 +1434,7 @@ int connection_setup_sockets (ice_config_t *config)
sock_t sock = sock_get_server_socket (listener->port, listener->bind_address);
if (sock == SOCK_ERROR)
break;
if (sock_listen (sock, ICE_LISTEN_QUEUE) == SOCK_ERROR)
if (sock_listen (sock, ICECAST_LISTEN_QUEUE) == SOCK_ERROR)
{
sock_close (sock);
break;

6
src/global.h
View File

@ -13,10 +13,10 @@
#ifndef __GLOBAL_H__
#define __GLOBAL_H__
#define ICE_LISTEN_QUEUE 5
#define ICECAST_LISTEN_QUEUE 5
#define ICE_RUNNING 1
#define ICE_HALTING 2
#define ICECAST_RUNNING 1
#define ICECAST_HALTING 2
#define ICECAST_VERSION_STRING "Icecast " PACKAGE_VERSION

4
src/main.c
View File

@ -286,7 +286,7 @@ static int _start_listening(void)
{
int i;
for(i=0; i < global.server_sockets; i++) {
if (sock_listen(global.serversock[i], ICE_LISTEN_QUEUE) == SOCK_ERROR)
if (sock_listen(global.serversock[i], ICECAST_LISTEN_QUEUE) == SOCK_ERROR)
return 0;
sock_set_blocking(global.serversock[i], 0);
@ -511,7 +511,7 @@ int main(int argc, char **argv)
/* REM 3D Graphics */
/* let her rip */
global.running = ICE_RUNNING;
global.running = ICECAST_RUNNING;
/* Startup yp thread */
yp_initialize();

2
src/sighandler.c
View File

@ -70,7 +70,7 @@ void _sig_die(int signo)
ICECAST_LOG_INFO("Caught signal %d, shutting down...", signo);
/* inform the server to start shutting down */
global.running = ICE_HALTING;
global.running = ICECAST_HALTING;
}
#endif

6
src/source.c
View File

@ -462,7 +462,7 @@ static refbuf_t *get_next_buffer (source_t *source)
if (source->short_delay)
delay = 0;
while (global.running == ICE_RUNNING && source->running)
while (global.running == ICECAST_RUNNING && source->running)
{
int fds = 0;
time_t current = time (NULL);
@ -702,7 +702,7 @@ void source_main (source_t *source)
source_init (source);
while (global.running == ICE_RUNNING && source->running) {
while (global.running == ICECAST_RUNNING && source->running) {
int remove_from_q;
refbuf = get_next_buffer (source);
@ -1455,7 +1455,7 @@ void source_recheck_mounts (int update_all)
stats_event (mount->mountname, NULL, NULL);
/* check for fallback to file */
if (global.running == ICE_RUNNING && mount->fallback_mount)
if (global.running == ICECAST_RUNNING && mount->fallback_mount)
{
source_t *fallback = source_find_mount (mount->fallback_mount);
if (fallback == NULL)