diff options
| -rwxr-xr-x | apps/app_directory.c | 1 | ||||
| -rwxr-xr-x | apps/app_festival.c | 9 | ||||
| -rwxr-xr-x | apps/app_milliwatt.c | 2 | ||||
| -rwxr-xr-x | asterisk.c | 25 | ||||
| -rwxr-xr-x | channels/chan_mgcp.c | 2 | ||||
| -rwxr-xr-x | cli.c | 1 |
6 files changed, 21 insertions, 19 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 00c19be64..949676d86 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -112,7 +112,6 @@ static char *convert(char *lastname) case 'Z': tmp[lcount++] = '9'; break; - default: } lastname++; } diff --git a/apps/app_festival.c b/apps/app_festival.c index 4801edc4a..58f2d77ff 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -46,8 +46,9 @@ static char *app = "Festival"; static char *synopsis = "Say text to the user"; static char *descrip = -" Festival(): Connect to Festival, send the argument, get back the waveform," -"play it to the user.\n"; +" Festival(text[|intkeys]): Connect to Festival, send the argument, get back the waveform," +"play it to the user, allowing any given interrupt keys to immediately terminate and return\n" +"the value.\n"; STANDARD_LOCAL_USER; @@ -302,9 +303,7 @@ static int festival_exec(struct ast_channel *chan, void *data) if (!(temp = ast_variable_retrieve(cfg, "general", "usecache"))) { usecache=0; } else { - if (strcasecmp(temp,"yes")==0) { - usecache=1; - } + usecache = ast_true(temp); } if (!(cachedir = ast_variable_retrieve(cfg, "general", "cachedir"))) { cachedir = "/tmp/"; diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index b51d8b2dd..a2f92dcf6 100755 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -55,7 +55,7 @@ static void milliwatt_release(struct ast_channel *chan, void *data) return; } -static int milliwatt_generate(struct ast_channel *chan, void *data, int len) +static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int samples) { struct ast_frame wf; unsigned char waste[AST_FRIENDLY_OFFSET]; diff --git a/asterisk.c b/asterisk.c index 98af3cc91..820c52ff9 100755 --- a/asterisk.c +++ b/asterisk.c @@ -448,29 +448,34 @@ static void __quit_handler(int num) static pthread_t consolethread = -1; -static int fix_header(char *outbuf, int maxout, char **s, char *cmp) +static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp) { - if (!strncmp(*s, cmp, strlen(cmp))) { - *s += strlen(cmp); + const char *c; + if (!strncmp(s, cmp, strlen(cmp))) { + c = s + strlen(cmp); term_color(outbuf, cmp, COLOR_GRAY, 0, maxout); - return 1; + return c; } - return 0; + return NULL; } static void console_verboser(const char *s, int pos, int replace, int complete) { char tmp[80]; + const char *c=NULL; /* Return to the beginning of the line */ if (!pos) { fprintf(stdout, "\r"); - if (fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_4) || - fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_3) || - fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_2) || - fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_1)) + if ((c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_4)) || + (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_3)) || + (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_2)) || + (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) fputs(tmp, stdout); } - fputs(s + pos,stdout); + if (c) + fputs(c + pos,stdout); + else + fputs(s + pos,stdout); fflush(stdout); if (complete) /* Wake up a select()ing console */ diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index b399b8cb7..c6a29e4fd 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -399,7 +399,7 @@ static int mgcp_postrequest(struct mgcp_subchannel *sub, unsigned char *data, in } time(&t); if (sub->messagepending && (sub->lastouttime + 20 < t)) { - ast_log(LOG_NOTICE, "Timeout waiting for response to message:%d, lastouttime: %d, now: %d. Dumping pending queue\n", + ast_log(LOG_NOTICE, "Timeout waiting for response to message:%d, lastouttime: %ld, now: %ld. Dumping pending queue\n", sub->msgs ? sub->msgs->seqno : -1, sub->lastouttime, t); dump_queue(sub->parent); } @@ -1007,7 +1007,6 @@ int ast_cli_command(int fd, char *s) case RESULT_SHOWUSAGE: ast_cli(fd, e->usage); break; - default: } } else ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(argv)); |