Commit dac1cf97 authored by Karl Heyes's avatar Karl Heyes

small cleanup and don't shutdown curl too early

svn path=/trunk/icecast/; revision=5860
parent 176804e4
...@@ -76,6 +76,7 @@ static void _fatal_error(char *perr) ...@@ -76,6 +76,7 @@ static void _fatal_error(char *perr)
static void _print_usage() static void _print_usage()
{ {
printf(ICECAST_VERSION_STRING "\n\n");
printf("usage: icecast [-h -b -v] -c <file>\n"); printf("usage: icecast [-h -b -v] -c <file>\n");
printf("options:\n"); printf("options:\n");
printf("\t-c <file>\tSpecify configuration file\n"); printf("\t-c <file>\tSpecify configuration file\n");
...@@ -109,14 +110,14 @@ static void _initialize_subsystems(void) ...@@ -109,14 +110,14 @@ static void _initialize_subsystems(void)
static void _shutdown_subsystems(void) static void _shutdown_subsystems(void)
{ {
#ifdef USE_YP
curl_shutdown();
#endif
fserve_shutdown(); fserve_shutdown();
xslt_shutdown(); xslt_shutdown();
refbuf_shutdown(); refbuf_shutdown();
slave_shutdown(); slave_shutdown();
stats_shutdown(); stats_shutdown();
#ifdef USE_YP
curl_shutdown();
#endif
/* Now that these are done, we can stop the loggers. */ /* Now that these are done, we can stop the loggers. */
_stop_logging(); _stop_logging();
...@@ -153,6 +154,7 @@ static int _parse_config_file(int argc, char **argv, char *filename, int size) ...@@ -153,6 +154,7 @@ static int _parse_config_file(int argc, char **argv, char *filename, int size)
fprintf(stdout, "%s\n", ICECAST_VERSION_STRING); fprintf(stdout, "%s\n", ICECAST_VERSION_STRING);
exit(0); exit(0);
} }
if (strcmp(argv[i], "-c") == 0) { if (strcmp(argv[i], "-c") == 0) {
if (i + 1 < argc) { if (i + 1 < argc) {
strncpy(filename, argv[i + 1], size-1); strncpy(filename, argv[i + 1], size-1);
...@@ -452,7 +454,7 @@ int main(int argc, char **argv) ...@@ -452,7 +454,7 @@ int main(int argc, char **argv)
} }
} }
INFO0("icecast server started"); INFO0 (ICECAST_VERSION_STRING " server started");
/* REM 3D Graphics */ /* REM 3D Graphics */
...@@ -483,16 +485,3 @@ int main(int argc, char **argv) ...@@ -483,16 +485,3 @@ int main(int argc, char **argv)
} }
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