diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-30 20:40:08 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-30 20:40:08 +0000 |
| commit | 6d0e38332157bad2ad3c3667cd80c214e47fb83a (patch) | |
| tree | fa98c6c19dbadcf2986ba059b1d090a07d8b1044 /res | |
| parent | 72fbcfd95d3f10f3ce78282760856e7b3ce7f48d (diff) | |
Merged revisions 289543,289581 via svnmerge from
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
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 7de717883..f7bc8d9cf 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -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 |