kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 289543,289581 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r289543 | tilghman | 2010-09-30 12:50:52 -0500 (Thu, 30 Sep 2010) | 2 lines
  
  More Solaris compatibility fixes
........
  r289581 | tilghman | 2010-09-30 15:23:10 -0500 (Thu, 30 Sep 2010) | 2 lines
  
  Solaris fixes.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-09-30 20:40:08 +00:00
parent 72fbcfd95d
commit 6d0e383321
6 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/res_agi.c
View File

@@ -3029,11 +3029,20 @@ int AST_OPTIONAL_API_NAME(ast_agi_register)(struct ast_module *mod, agi_command
*((char **) &cmd->syntax) = ast_xmldoc_build_syntax("agi", fullcmd);
*((char **) &cmd->seealso) = ast_xmldoc_build_seealso("agi", fullcmd);
*((enum ast_doc_src *) &cmd->docsrc) = AST_XML_DOC;
#elif (!defined(HAVE_NULLSAFE_PRINTF))
*((char **) &cmd->summary) = ast_strdup("");
*((char **) &cmd->usage) = ast_strdup("");
*((char **) &cmd->syntax) = ast_strdup("");
*((char **) &cmd->seealso) = ast_strdup("");
#endif
#ifndef HAVE_NULLSAFE_PRINTF
if (!cmd->summary) {
*((char **) &cmd->summary) = ast_strdup("");
}
if (!cmd->usage) {
*((char **) &cmd->usage) = ast_strdup("");
}
if (!cmd->syntax) {
*((char **) &cmd->syntax) = ast_strdup("");
}
if (!cmd->seealso) {
*((char **) &cmd->seealso) = ast_strdup("");
}
#endif
}
@@ -3802,15 +3811,18 @@ AST_TEST_DEFINE(test_agi_null_docs)
}
if (ast_agi_register(ast_module_info->self, &noop_command) == 0) {
ast_test_status_update(test, "Unable to register testnoop command, because res_agi is not loaded.\n");
return AST_TEST_NOT_RUN;
}
#ifndef HAVE_NULLSAFE_PRINTF
/* Test for condition without actually crashing Asterisk */
if (noop_command.usage == NULL) {
ast_test_status_update(test, "AGI testnoop usage was not updated properly.\n");
res = AST_TEST_FAIL;
}
if (noop_command.syntax == NULL) {
ast_test_status_update(test, "AGI testnoop syntax was not updated properly.\n");
res = AST_TEST_FAIL;
}
#endif