aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Rename shutdown() to ez_shutdown() to prevent a function name clash on Windows.

Browse Source 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13458 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2007-08-08 13:15:04 +00:00
parent 086b61a190
commit 71a41f876c
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/ezstream.c
View File

@ -132,7 +132,7 @@ int streamPlaylist(shout_t *, const char *);
char * getProgname(const char *); char * getProgname(const char *);
void usage(void); void usage(void);
void usageHelp(void); void usageHelp(void);
int shutdown(int); int ez_shutdown(int);
#ifdef HAVE_SIGNALS #ifdef HAVE_SIGNALS
void sig_handler(int); void sig_handler(int);
@ -1007,7 +1007,7 @@ getProgname(const char *argv0)
} }
int int
shutdown(int exitval) ez_shutdown(int exitval)
{ {
shout_shutdown(); shout_shutdown();
playlist_shutdown(); playlist_shutdown();
@ -1072,26 +1072,26 @@ main(int argc, char *argv[])
if (configFile != NULL) { if (configFile != NULL) {
printf("Error: multiple -c arguments given\n"); printf("Error: multiple -c arguments given\n");
usage(); usage();
return (shutdown(2)); return (ez_shutdown(2));
} }
configFile = xstrdup(optarg); configFile = xstrdup(optarg);
break; break;
case 'h': case 'h':
usage(); usage();
usageHelp(); usageHelp();
return (shutdown(0)); return (ez_shutdown(0));
case 'q': case 'q':
qFlag = 1; qFlag = 1;
break; break;
case 'V': case 'V':
printf("%s\n", PACKAGE_STRING); printf("%s\n", PACKAGE_STRING);
return (shutdown(0)); return (ez_shutdown(0));
case 'v': case 'v':
vFlag++; vFlag++;
break; break;
case '?': case '?':
usage(); usage();
return (shutdown(2)); return (ez_shutdown(2));
default: default:
break; break;
} }
@ -1102,7 +1102,7 @@ main(int argc, char *argv[])
if (configFile == NULL) { if (configFile == NULL) {
printf("You must supply a config file with the -c argument.\n"); printf("You must supply a config file with the -c argument.\n");
usage(); usage();
return (shutdown(2)); return (ez_shutdown(2));
} else { } else {
/* /*
* Attempt to open configFile here for a more meaningful error * Attempt to open configFile here for a more meaningful error
@ -1115,7 +1115,7 @@ main(int argc, char *argv[])
if (stat(configFile, &st) == -1) { if (stat(configFile, &st) == -1) {
printf("%s: %s\n", configFile, strerror(errno)); printf("%s: %s\n", configFile, strerror(errno));
usage(); usage();
return (shutdown(2)); return (ez_shutdown(2));
} }
if (vFlag && (st.st_mode & (S_IRGRP | S_IROTH))) if (vFlag && (st.st_mode & (S_IRGRP | S_IROTH)))
printf("%s: Warning: %s is group and/or world readable\n", printf("%s: Warning: %s is group and/or world readable\n",
@ -1123,7 +1123,7 @@ main(int argc, char *argv[])
if (st.st_mode & (S_IWGRP | S_IWOTH)) { if (st.st_mode & (S_IWGRP | S_IWOTH)) {
printf("%s: Error: %s is group and/or world writeable\n", printf("%s: Error: %s is group and/or world writeable\n",
__progname, configFile); __progname, configFile);
return (shutdown(2)); return (ez_shutdown(2));
} }
#else #else
FILE *tmp; FILE *tmp;
@ -1131,40 +1131,40 @@ main(int argc, char *argv[])
if ((tmp = fopen(configFile, "r")) == NULL) { if ((tmp = fopen(configFile, "r")) == NULL) {
printf("%s: %s\n", configFile, strerror(errno)); printf("%s: %s\n", configFile, strerror(errno));
usage(); usage();
return (shutdown(2)); return (ez_shutdown(2));
} }
fclose(tmp); fclose(tmp);
#endif /* HAVE_STAT */ #endif /* HAVE_STAT */
} }
if (!parseConfig(configFile)) if (!parseConfig(configFile))
return (shutdown(2)); return (ez_shutdown(2));
if (pezConfig->URL == NULL) { if (pezConfig->URL == NULL) {
printf("%s: Error: Missing <url>\n", configFile); printf("%s: Error: Missing <url>\n", configFile);
return (shutdown(2)); return (ez_shutdown(2));
} }
if (!urlParse(pezConfig->URL, &host, &port, &mount)) { if (!urlParse(pezConfig->URL, &host, &port, &mount)) {
printf("Must be of the form ``http://server:port/mountpoint''\n"); printf("Must be of the form ``http://server:port/mountpoint''\n");
return (shutdown(2)); return (ez_shutdown(2));
} }
if (strlen(host) == 0) { if (strlen(host) == 0) {
printf("%s: Error: Invalid <url>: Missing server:\n", configFile); printf("%s: Error: Invalid <url>: Missing server:\n", configFile);
printf("Must be of the form ``http://server:port/mountpoint''\n"); printf("Must be of the form ``http://server:port/mountpoint''\n");
return (shutdown(2)); return (ez_shutdown(2));
} }
if (strlen(mount) == 0) { if (strlen(mount) == 0) {
printf("%s: Error: Invalid <url>: Missing mountpoint:\n", configFile); printf("%s: Error: Invalid <url>: Missing mountpoint:\n", configFile);
printf("Must be of the form ``http://server:port/mountpoint''\n"); printf("Must be of the form ``http://server:port/mountpoint''\n");
return (shutdown(2)); return (ez_shutdown(2));
} }
if (pezConfig->password == NULL) { if (pezConfig->password == NULL) {
printf("%s: Error: Missing <sourcepassword>\n", configFile); printf("%s: Error: Missing <sourcepassword>\n", configFile);
return (shutdown(2)); return (ez_shutdown(2));
} }
if (pezConfig->fileName == NULL) { if (pezConfig->fileName == NULL) {
printf("%s: Error: Missing <filename>\n", configFile); printf("%s: Error: Missing <filename>\n", configFile);
return (shutdown(2)); return (ez_shutdown(2));
} }
if (pezConfig->format == NULL) { if (pezConfig->format == NULL) {
printf("%s: Warning: Missing <format>:\n", configFile); printf("%s: Warning: Missing <format>:\n", configFile);
@ -1175,45 +1175,45 @@ main(int argc, char *argv[])
if ((shout = shout_new()) == NULL) { if ((shout = shout_new()) == NULL) {
printf("%s: shout_new(): %s", __progname, strerror(ENOMEM)); printf("%s: shout_new(): %s", __progname, strerror(ENOMEM));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_host(shout, host) != SHOUTERR_SUCCESS) { if (shout_set_host(shout, host) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_host(): %s\n", __progname, printf("%s: shout_set_host(): %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_protocol(shout, SHOUT_PROTOCOL_HTTP) != SHOUTERR_SUCCESS) { if (shout_set_protocol(shout, SHOUT_PROTOCOL_HTTP) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_protocol(): %s\n", __progname, printf("%s: shout_set_protocol(): %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_port(shout, port) != SHOUTERR_SUCCESS) { if (shout_set_port(shout, port) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_port: %s\n", __progname, printf("%s: shout_set_port: %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_password(shout, pezConfig->password) != SHOUTERR_SUCCESS) { if (shout_set_password(shout, pezConfig->password) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_password(): %s\n", __progname, printf("%s: shout_set_password(): %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_mount(shout, mount) != SHOUTERR_SUCCESS) { if (shout_set_mount(shout, mount) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_mount(): %s\n", __progname, printf("%s: shout_set_mount(): %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (shout_set_user(shout, "source") != SHOUTERR_SUCCESS) { if (shout_set_user(shout, "source") != SHOUTERR_SUCCESS) {
printf("%s: shout_set_user(): %s\n", __progname, printf("%s: shout_set_user(): %s\n", __progname,
shout_get_error(shout)); shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (!strcmp(pezConfig->format, MP3_FORMAT)) { if (!strcmp(pezConfig->format, MP3_FORMAT)) {
if (shout_set_format(shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) { if (shout_set_format(shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_format(MP3): %s\n", printf("%s: shout_set_format(MP3): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (!strcmp(pezConfig->format, VORBIS_FORMAT) || if (!strcmp(pezConfig->format, VORBIS_FORMAT) ||
@ -1221,7 +1221,7 @@ main(int argc, char *argv[])
if (shout_set_format(shout, SHOUT_FORMAT_OGG) != SHOUTERR_SUCCESS) { if (shout_set_format(shout, SHOUT_FORMAT_OGG) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_format(OGG): %s\n", printf("%s: shout_set_format(OGG): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
@ -1229,63 +1229,63 @@ main(int argc, char *argv[])
if (shout_set_name(shout, pezConfig->serverName) != SHOUTERR_SUCCESS) { if (shout_set_name(shout, pezConfig->serverName) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_name(): %s\n", printf("%s: shout_set_name(): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverURL) { if (pezConfig->serverURL) {
if (shout_set_url(shout, pezConfig->serverURL) != SHOUTERR_SUCCESS) { if (shout_set_url(shout, pezConfig->serverURL) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_url(): %s\n", printf("%s: shout_set_url(): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverGenre) { if (pezConfig->serverGenre) {
if (shout_set_genre(shout, pezConfig->serverGenre) != SHOUTERR_SUCCESS) { if (shout_set_genre(shout, pezConfig->serverGenre) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_genre(): %s\n", printf("%s: shout_set_genre(): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverDescription) { if (pezConfig->serverDescription) {
if (shout_set_description(shout, pezConfig->serverDescription) != SHOUTERR_SUCCESS) { if (shout_set_description(shout, pezConfig->serverDescription) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_description(): %s\n", printf("%s: shout_set_description(): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverBitrate) { if (pezConfig->serverBitrate) {
if (shout_set_audio_info(shout, SHOUT_AI_BITRATE, pezConfig->serverBitrate) != SHOUTERR_SUCCESS) { if (shout_set_audio_info(shout, SHOUT_AI_BITRATE, pezConfig->serverBitrate) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_audio_info(AI_BITRATE): %s\n", printf("%s: shout_set_audio_info(AI_BITRATE): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverChannels) { if (pezConfig->serverChannels) {
if (shout_set_audio_info(shout, SHOUT_AI_CHANNELS, pezConfig->serverChannels) != SHOUTERR_SUCCESS) { if (shout_set_audio_info(shout, SHOUT_AI_CHANNELS, pezConfig->serverChannels) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_audio_info(AI_CHANNELS): %s\n", printf("%s: shout_set_audio_info(AI_CHANNELS): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverSamplerate) { if (pezConfig->serverSamplerate) {
if (shout_set_audio_info(shout, SHOUT_AI_SAMPLERATE, pezConfig->serverSamplerate) != SHOUTERR_SUCCESS) { if (shout_set_audio_info(shout, SHOUT_AI_SAMPLERATE, pezConfig->serverSamplerate) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_audio_info(AI_SAMPLERATE): %s\n", printf("%s: shout_set_audio_info(AI_SAMPLERATE): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (pezConfig->serverQuality) { if (pezConfig->serverQuality) {
if (shout_set_audio_info(shout, SHOUT_AI_QUALITY, pezConfig->serverQuality) != SHOUTERR_SUCCESS) { if (shout_set_audio_info(shout, SHOUT_AI_QUALITY, pezConfig->serverQuality) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_audio_info(AI_QUALITY): %s\n", printf("%s: shout_set_audio_info(AI_QUALITY): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
if (shout_set_public(shout, pezConfig->serverPublic) != SHOUTERR_SUCCESS) { if (shout_set_public(shout, pezConfig->serverPublic) != SHOUTERR_SUCCESS) {
printf("%s: shout_set_public(): %s\n", printf("%s: shout_set_public(): %s\n",
__progname, shout_get_error(shout)); __progname, shout_get_error(shout));
return (shutdown(1)); return (ez_shutdown(1));
} }
if (pezConfig->metadataProgram != NULL) if (pezConfig->metadataProgram != NULL)
@ -1303,7 +1303,7 @@ main(int argc, char *argv[])
if (sigaction(ezstream_signals[i], &act, NULL) == -1) { if (sigaction(ezstream_signals[i], &act, NULL) == -1) {
printf("%s: sigaction(): %s\n", printf("%s: sigaction(): %s\n",
__progname, strerror(errno)); __progname, strerror(errno));
return (shutdown(1)); return (ez_shutdown(1));
} }
} }
#endif /* HAVE_SIGNALS */ #endif /* HAVE_SIGNALS */
@ -1359,5 +1359,5 @@ main(int argc, char *argv[])
xfree(mount); xfree(mount);
playlist_free(&playlist); playlist_free(&playlist);
return (shutdown(0)); return (ez_shutdown(0));
} }