diff options
| author | David M. Lee <dlee@digium.com> | 2013-03-22 19:26:37 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-03-22 19:26:37 +0000 |
| commit | cfd2b244f7afbe828a2d6b80d680009d7cfbd05c (patch) | |
| tree | c82e5c2e79e03fe1aeda2c9f137c047c87c11a2d /main | |
| parent | cf9324b25eb8a7dc5cef77f54e12758dfbcd6645 (diff) | |
Corrected some module issues introduced by r383579.
When I moved res_json.c to json.c, I left the MODULE_INFO stuff in there,
which was interesting if you ran module show. I also forgot to call what
was in module_load() from asterisk main().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 2 | ||||
| -rw-r--r-- | main/json.c | 13 |
2 files changed, 3 insertions, 12 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 3a0e87c41..d7eb8d953 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -241,6 +241,7 @@ int daemon(int, int); /* defined in libresolv of all places */ #include "asterisk/uuid.h" #include "asterisk/sorcery.h" #include "asterisk/stasis.h" +#include "asterisk/json.h" #include "../defaults.h" @@ -4070,6 +4071,7 @@ int main(int argc, char *argv[]) ast_el_read_history(filename); } + ast_json_init(); ast_ulaw_init(); ast_alaw_init(); tdd_init(); diff --git a/main/json.c b/main/json.c index f1ebaef60..b91707a8a 100644 --- a/main/json.c +++ b/main/json.c @@ -502,19 +502,8 @@ struct ast_json *ast_json_deep_copy(const struct ast_json *value) return (struct ast_json *)json_deep_copy((json_t *)value); } -static int unload_module(void) -{ - /* Nothing to do */ - return 0; -} - -static int load_module(void) +void ast_json_init(void) { /* Setup to use Asterisk custom allocators */ ast_json_reset_alloc_funcs(); - return AST_MODULE_LOAD_SUCCESS; } - -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "JSON library", - .load = load_module, - .unload = unload_module); |