kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected some module issues introduced by r383579.

Browse Source 
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
This commit is contained in:
David M. Lee
2013-03-22 19:26:37 +00:00
parent cf9324b25e
commit cfd2b244f7
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/json.h
View File

@@ -32,6 +32,11 @@
/*!@{*/ /*!@{*/
/*!
* \brief Initialize the JSON library.
*/
void ast_json_init(void);
/*! /*!
* \brief Set custom allocators instead of the standard ast_malloc() and ast_free(). * \brief Set custom allocators instead of the standard ast_malloc() and ast_free().
* \since 12.0.0 * \since 12.0.0

2
main/asterisk.c
View File

@@ -241,6 +241,7 @@ int daemon(int, int); /* defined in libresolv of all places */
#include "asterisk/uuid.h" #include "asterisk/uuid.h"
#include "asterisk/sorcery.h" #include "asterisk/sorcery.h"
#include "asterisk/stasis.h" #include "asterisk/stasis.h"
#include "asterisk/json.h"
#include "../defaults.h" #include "../defaults.h"
@@ -4070,6 +4071,7 @@ int main(int argc, char *argv[])
ast_el_read_history(filename); ast_el_read_history(filename);
} }
ast_json_init();
ast_ulaw_init(); ast_ulaw_init();
ast_alaw_init(); ast_alaw_init();
tdd_init(); tdd_init();

13
main/json.c
View File

@@ -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); return (struct ast_json *)json_deep_copy((json_t *)value);
} }
static int unload_module(void) void ast_json_init(void)
{
/* Nothing to do */
return 0;
}
static int load_module(void)
{ {
/* Setup to use Asterisk custom allocators */ /* Setup to use Asterisk custom allocators */
ast_json_reset_alloc_funcs(); 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);