kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

More formatting cleanups.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-06-29 04:42:19 +00:00
parent 560068617a
commit 3d0e3d3c0f
6 changed files with 222 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
asterisk.c
View File

@@ -209,29 +209,28 @@ int ast_safe_system(const char *s)
*/
static void ast_network_puts(const char *string)
{
int x;
for (x=0;x<AST_MAX_CONNECTS; x++) {
if (consoles[x].fd > -1)
fdprint(consoles[x].p[1], string);
}
int x;
for (x=0;x<AST_MAX_CONNECTS; x++) {
if (consoles[x].fd > -1)
fdprint(consoles[x].p[1], string);
}
}
/*
* write the string to the console, and all attached
* console clients
*/
void ast_console_puts(const char *string)
{
fputs(string, stdout);
fflush(stdout);
ast_network_puts(string);
fputs(string, stdout);
fflush(stdout);
ast_network_puts(string);
}
static void network_verboser(const char *s, int pos, int replace, int complete)
/* ARGUSED */
/* ARGUSED */
{
ast_network_puts(s);
ast_network_puts(s);
}
static pthread_t lthread;
@@ -840,7 +839,7 @@ static struct ast_cli_entry astbang = { { "!", NULL }, handle_bang, "Execute a s
static int ast_el_read_char(EditLine *el, char *cp)
{
int num_read=0;
int num_read=0;
int lastpos=0;
struct pollfd fds[2];
int res;
@@ -1065,24 +1064,24 @@ static char *cli_prompt(EditLine *el)
static char **ast_el_strtoarr(char *buf)
{
char **match_list = NULL, *retstr;
size_t match_list_len;
size_t match_list_len;
int matches = 0;
match_list_len = 1;
match_list_len = 1;
while ( (retstr = strsep(&buf, " ")) != NULL) {
if (!strcmp(retstr, AST_CLI_COMPLETE_EOF))
break;
if (matches + 1 >= match_list_len) {
match_list_len <<= 1;
match_list = realloc(match_list, match_list_len * sizeof(char *));
if (matches + 1 >= match_list_len) {
match_list_len <<= 1;
match_list = realloc(match_list, match_list_len * sizeof(char *));
}
match_list[matches++] = strdup(retstr);
}
if (!match_list)
return (char **) NULL;
if (!match_list)
return (char **) NULL;
if (matches>= match_list_len)
match_list = realloc(match_list, (match_list_len + 1) * sizeof(char *));
@@ -1596,8 +1595,8 @@ int main(int argc, char *argv[])
fflush(stdout);
/* Test recursive mutex locking. */
if(test_for_thread_safety())
ast_verbose("Warning! Asterisk is not thread safe.\n");
if (test_for_thread_safety())
ast_verbose("Warning! Asterisk is not thread safe.\n");
if (option_console && !option_verbose)
ast_verbose("[ Reading Master Configuration ]");
@@ -1611,11 +1610,11 @@ int main(int argc, char *argv[])
if (option_console) {
if (el_hist == NULL || el == NULL)
ast_el_initialize();
if (el_hist == NULL || el == NULL)
ast_el_initialize();
if (!ast_strlen_zero(filename))
ast_el_read_history(filename);
if (!ast_strlen_zero(filename))
ast_el_read_history(filename);
}
if (ast_tryconnect()) {
@@ -1768,12 +1767,12 @@ int main(int argc, char *argv[])
consolehandler((char *)buf);
} else {
if (option_remote)
ast_cli(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n");
ast_cli(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n");
}
}
} else {
/* Do nothing */
/* Do nothing */
for(;;)
poll(NULL,0, -1);
}