automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-12 14:02:32 +00:00
parent fac0ba002f
commit 94755549d7
9 changed files with 29 additions and 114 deletions

View File

@@ -1745,7 +1745,9 @@ static int pbx_load_module(void)
}
}
free(tc);
} else fprintf(stderr,"Error strdup returned NULL in %s\n",__PRETTY_FUNCTION__);
} else {
ast_log(LOG_ERROR, "Memory allocation failure\n");
}
} else if(!strcasecmp(v->name, "include")) {
memset(realvalue, 0, sizeof(realvalue));
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);