diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-08-05 16:56:11 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-08-05 16:56:11 +0000 |
| commit | 7df8b8b848b1cd8c218698d0c03ff8d8481a7fcf (patch) | |
| tree | d6b2d0850bac2afae7026e0560ca97c249f82d66 /pbx | |
| parent | 8ba981911a30f83be404a5e68d5136d0bf8b2cc2 (diff) | |
make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_dundi.c | 2 | ||||
| -rw-r--r-- | pbx/pbx_lua.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index ca13bdc76..25206f156 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -3956,7 +3956,7 @@ static int dundi_query_read(struct ast_channel *chan, const char *cmd, char *dat drds->id = ast_atomic_fetchadd_int((int *) &dundi_result_id, 1); snprintf(buf, len, "%u", drds->id); - if (!(datastore = ast_channel_datastore_alloc(&dundi_result_datastore_info, buf))) { + if (!(datastore = ast_datastore_alloc(&dundi_result_datastore_info, buf))) { drds_destroy(drds); ast_module_user_remove(u); return -1; diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 704d811de..689ba1c77 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -988,7 +988,7 @@ static lua_State *lua_get_state(struct ast_channel *chan) if (!datastore) { /* nothing found, allocate a new lua state */ - datastore = ast_channel_datastore_alloc(&lua_datastore, NULL); + datastore = ast_datastore_alloc(&lua_datastore, NULL); if (!datastore) { ast_log(LOG_ERROR, "Error allocation channel datastore for lua_State\n"); return NULL; @@ -996,7 +996,7 @@ static lua_State *lua_get_state(struct ast_channel *chan) datastore->data = luaL_newstate(); if (!datastore->data) { - ast_channel_datastore_free(datastore); + ast_datastore_free(datastore); ast_log(LOG_ERROR, "Error allocating lua_State, no memory\n"); return NULL; } @@ -1015,7 +1015,7 @@ static lua_State *lua_get_state(struct ast_channel *chan) ast_channel_datastore_remove(chan, datastore); ast_channel_unlock(chan); - ast_channel_datastore_free(datastore); + ast_datastore_free(datastore); return NULL; } } |