diff options
author | Mark Michelson <mmichelson@digium.com> | 2013-04-25 18:25:31 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2013-04-25 18:25:31 +0000 |
commit | 74f2318051ca04c240d3b111397365837fb618b6 (patch) | |
tree | ef7ddfc3ce21969c93a5e4ab8adf60b12df2f4d9 /tests/test_sorcery.c | |
parent | b4c881c86ec8f823dba15bb69eb2cb9f3c7aeb88 (diff) |
Merge the pimp_my_sip branch into trunk.
The pimp_my_sip branch is being merged at this point because
it offers basic functionality, and from an API standpoint, things
are complete.
SIP work is *not* feature-complete; however, with the completion
of the SUBSCRIBE/NOTIFY API, all APIs (except a PUBLISH API) have
been created, and thus it is possible for developers to attempt
to create new SIP work.
API documentation can be found in the doxygen in the code, but
usability documentation is still lacking.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@386540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_sorcery.c')
-rw-r--r-- | tests/test_sorcery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_sorcery.c b/tests/test_sorcery.c index 3877edc62..6cfd2de4f 100644 --- a/tests/test_sorcery.c +++ b/tests/test_sorcery.c @@ -130,9 +130,10 @@ struct sorcery_test_caching { static int apply_handler_called; /*! \brief Simple apply handler which sets global scope integer to 1 if called */ -static void test_apply_handler(const struct ast_sorcery *sorcery, void *obj) +static int test_apply_handler(const struct ast_sorcery *sorcery, void *obj) { apply_handler_called = 1; + return 0; } /*! \brief Global scope caching structure for testing */ |