kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanups

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-06-27 23:02:52 +00:00
parent e7a1bdc90c
commit f945ae2122
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_directory.c
View File

@@ -112,7 +112,6 @@ static char *convert(char *lastname)
case 'Z': case 'Z':
tmp[lcount++] = '9'; tmp[lcount++] = '9';
break; break;
default:
} }
lastname++; lastname++;
} }

9
apps/app_festival.c
View File

@@ -46,8 +46,9 @@ static char *app = "Festival";
static char *synopsis = "Say text to the user"; static char *synopsis = "Say text to the user";
static char *descrip = static char *descrip =
" Festival(): Connect to Festival, send the argument, get back the waveform," " Festival(text[|intkeys]): Connect to Festival, send the argument, get back the waveform,"
"play it to the user.\n"; "play it to the user, allowing any given interrupt keys to immediately terminate and return\n"
"the value.\n";
STANDARD_LOCAL_USER; 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"))) { if (!(temp = ast_variable_retrieve(cfg, "general", "usecache"))) {
usecache=0; usecache=0;
} else { } else {
if (strcasecmp(temp,"yes")==0) { usecache = ast_true(temp);
usecache=1;
}
} }
if (!(cachedir = ast_variable_retrieve(cfg, "general", "cachedir"))) { if (!(cachedir = ast_variable_retrieve(cfg, "general", "cachedir"))) {
cachedir = "/tmp/"; cachedir = "/tmp/";

2
apps/app_milliwatt.c
View File

@@ -55,7 +55,7 @@ static void milliwatt_release(struct ast_channel *chan, void *data)
return; 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; struct ast_frame wf;
unsigned char waste[AST_FRIENDLY_OFFSET]; unsigned char waste[AST_FRIENDLY_OFFSET];

25
asterisk.c
View File

@@ -448,29 +448,34 @@ static void __quit_handler(int num)
static pthread_t consolethread = -1; 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))) { const char *c;
*s += strlen(cmp); if (!strncmp(s, cmp, strlen(cmp))) {
c = s + strlen(cmp);
term_color(outbuf, cmp, COLOR_GRAY, 0, maxout); 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) static void console_verboser(const char *s, int pos, int replace, int complete)
{ {
char tmp[80]; char tmp[80];
const char *c=NULL;
/* Return to the beginning of the line */ /* Return to the beginning of the line */
if (!pos) { if (!pos) {
fprintf(stdout, "\r"); fprintf(stdout, "\r");
if (fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_4) || if ((c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_4)) ||
fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_3) || (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_3)) ||
fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_2) || (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_2)) ||
fix_header(tmp, sizeof(tmp), &s, VERBOSE_PREFIX_1)) (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1)))
fputs(tmp, stdout); fputs(tmp, stdout);
} }
fputs(s + pos,stdout); if (c)
fputs(c + pos,stdout);
else
fputs(s + pos,stdout);
fflush(stdout); fflush(stdout);
if (complete) if (complete)
/* Wake up a select()ing console */ /* Wake up a select()ing console */

2
channels/chan_mgcp.c
View File

@@ -399,7 +399,7 @@ static int mgcp_postrequest(struct mgcp_subchannel *sub, unsigned char *data, in
} }
time(&t); time(&t);
if (sub->messagepending && (sub->lastouttime + 20 < 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); sub->msgs ? sub->msgs->seqno : -1, sub->lastouttime, t);
dump_queue(sub->parent); dump_queue(sub->parent);
} }

1
cli.c
View File

@@ -1007,7 +1007,6 @@ int ast_cli_command(int fd, char *s)
case RESULT_SHOWUSAGE: case RESULT_SHOWUSAGE:
ast_cli(fd, e->usage); ast_cli(fd, e->usage);
break; break;
default:
} }
} else } else
ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(argv)); ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(argv));