diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-05 23:32:42 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-05 23:32:42 +0000 |
commit | ec3737e8352a7e366a47323e2d01d3aff005d602 (patch) | |
tree | 76ff7f6c897bdfda963986fdaacae6e6ffc39542 /main | |
parent | cf7c7b4b3d9f4a61b6a6650e1b08aca32d126cb7 (diff) |
const-ify some more APIs, and fix rev 49710 from branch-1.4 in a better way here
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49711 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/db.c | 6 | ||||
-rw-r--r-- | main/pbx.c | 14 |
2 files changed, 11 insertions, 9 deletions
@@ -142,7 +142,7 @@ int ast_db_deltree(const char *family, const char *keytree) return 0; } -int ast_db_put(const char *family, const char *keys, char *value) +int ast_db_put(const char *family, const char *keys, const char *value) { char fullkey[256]; DBT key, data; @@ -159,7 +159,7 @@ int ast_db_put(const char *family, const char *keys, char *value) memset(&data, 0, sizeof(data)); key.data = fullkey; key.size = fullkeylen + 1; - data.data = value; + data.data = (char *) value; data.size = strlen(value) + 1; res = astdb->put(astdb, &key, &data, 0); astdb->sync(astdb, 0); @@ -542,7 +542,7 @@ static int manager_dbput(struct mansession *s, const struct message *m) return 0; } - res = ast_db_put(family, key, (char *) val); + res = ast_db_put(family, key, val); if (res) { astman_send_error(s, m, "Failed to update entry"); } else { diff --git a/main/pbx.c b/main/pbx.c index 8d8d1899d..e45495e5b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1407,10 +1407,11 @@ static char *func_args(char *function) return args; } -int ast_func_read(struct ast_channel *chan, char *function, char *workspace, size_t len) +int ast_func_read(struct ast_channel *chan, const char *function, char *workspace, size_t len) { - char *args = func_args(function); - struct ast_custom_function *acfptr = ast_custom_function_find(function); + char *copy = ast_strdupa(function); + char *args = func_args(copy); + struct ast_custom_function *acfptr = ast_custom_function_find(copy); if (acfptr == NULL) ast_log(LOG_ERROR, "Function %s not registered\n", function); @@ -1421,10 +1422,11 @@ int ast_func_read(struct ast_channel *chan, char *function, char *workspace, siz return -1; } -int ast_func_write(struct ast_channel *chan, char *function, const char *value) +int ast_func_write(struct ast_channel *chan, const char *function, const char *value) { - char *args = func_args(function); - struct ast_custom_function *acfptr = ast_custom_function_find(function); + char *copy = ast_strdupa(function); + char *args = func_args(copy); + struct ast_custom_function *acfptr = ast_custom_function_find(copy); if (acfptr == NULL) ast_log(LOG_ERROR, "Function %s not registered\n", function); |