port gcc 4.3.x warning fixes from trunk to this branch

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-03 00:39:04 +00:00
parent e23be17786
commit fa635ea4b0
48 changed files with 2915 additions and 765 deletions

View File

@@ -3750,10 +3750,16 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
gosub_argstart = strchr(gosubexec, ',');
if (gosub_argstart) {
*gosub_argstart = 0;
asprintf(&gosub_args, "%s,s,1(%s)", gosubexec, gosub_argstart + 1);
if (asprintf(&gosub_args, "%s,s,1(%s)", gosubexec, gosub_argstart + 1) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
gosub_args = NULL;
}
*gosub_argstart = '|';
} else {
asprintf(&gosub_args, "%s,s,1", gosubexec);
if (asprintf(&gosub_args, "%s,s,1", gosubexec) < 0) {
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
gosub_args = NULL;
}
}
if (gosub_args) {
res = pbx_exec(qe->chan, app, gosub_args);