mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Remove as much trailing whitespace as possible.
Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
* \brief Stream to an icecast server via ICES (see contrib/asterisk-ices.xml)
|
||||
*
|
||||
* \author Mark Spencer <markster@digium.com>
|
||||
*
|
||||
*
|
||||
* ICES - http://www.icecast.org/ices.php
|
||||
*
|
||||
* \ingroup applications
|
||||
@@ -30,7 +30,7 @@
|
||||
/*** MODULEINFO
|
||||
<support_level>extended</support_level>
|
||||
***/
|
||||
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
#include <signal.h>
|
||||
@@ -77,7 +77,7 @@ static int icesencode(char *filename, int fd)
|
||||
int res;
|
||||
|
||||
res = ast_safe_fork(0);
|
||||
if (res < 0)
|
||||
if (res < 0)
|
||||
ast_log(LOG_WARNING, "Fork failed\n");
|
||||
if (res) {
|
||||
return res;
|
||||
@@ -88,8 +88,8 @@ static int icesencode(char *filename, int fd)
|
||||
dup2(fd, STDIN_FILENO);
|
||||
ast_close_fds_above_n(STDERR_FILENO);
|
||||
|
||||
/* Most commonly installed in /usr/local/bin
|
||||
* But many places has it in /usr/bin
|
||||
/* Most commonly installed in /usr/local/bin
|
||||
* But many places has it in /usr/bin
|
||||
* As a last-ditch effort, try to use PATH
|
||||
*/
|
||||
execl(path_LOCAL "ices2", "ices", filename, SENTINEL);
|
||||
@@ -122,18 +122,18 @@ static int ices_exec(struct ast_channel *chan, const char *data)
|
||||
ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
if (pipe(fds)) {
|
||||
ast_log(LOG_WARNING, "Unable to create pipe\n");
|
||||
return -1;
|
||||
}
|
||||
ast_fd_set_flags(fds[1], O_NONBLOCK);
|
||||
|
||||
|
||||
ast_stopstream(chan);
|
||||
|
||||
if (ast_channel_state(chan) != AST_STATE_UP)
|
||||
res = ast_answer(chan);
|
||||
|
||||
|
||||
if (res) {
|
||||
close(fds[0]);
|
||||
close(fds[1]);
|
||||
@@ -154,10 +154,10 @@ static int ices_exec(struct ast_channel *chan, const char *data)
|
||||
ast_copy_string(filename, (char *) data, sizeof(filename));
|
||||
else
|
||||
snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_CONFIG_DIR, (char *)data);
|
||||
/* Placeholder for options */
|
||||
/* Placeholder for options */
|
||||
c = strchr(filename, '|');
|
||||
if (c)
|
||||
*c = '\0';
|
||||
*c = '\0';
|
||||
res = icesencode(filename, fds[0]);
|
||||
if (res >= 0) {
|
||||
pid = res;
|
||||
@@ -212,4 +212,3 @@ static int load_module(void)
|
||||
}
|
||||
|
||||
AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
|
||||
|
||||
|
Reference in New Issue
Block a user