import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-02 23:56:13 +00:00
parent bdb5cf6f46
commit 1036849a42
50 changed files with 991 additions and 504 deletions

View File

@@ -3834,10 +3834,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, application, gosub_args);