diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-08-28 18:32:56 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-08-28 18:32:56 +0000 |
| commit | 040a5f20f9fd04805dcb8b5dd5cc6028d11fa617 (patch) | |
| tree | c25307d562fc9a5264313a14869bcaa1395f737c /main/channel.c | |
| parent | 43e9b0f67cb87f430b71a646f1283764d94fdd09 (diff) | |
* Constify the uid field of channel datastores
* Convert some spaces to tabs in func_volume
* Add a note in channel.h making it clear that none of the datastore API calls
lock the channel they are given, so the channel should be locked before
calling the functions that take a channel argument.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 9d2460633..1b4971eb1 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1167,7 +1167,7 @@ void ast_channel_free(struct ast_channel *chan) ast_device_state_changed_literal(name); } -struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid) +struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) { struct ast_datastore *datastore = NULL; @@ -1201,7 +1201,7 @@ int ast_channel_datastore_free(struct ast_datastore *datastore) /* Free allocated UID memory */ if (datastore->uid != NULL) { - ast_free(datastore->uid); + ast_free((void *) datastore->uid); datastore->uid = NULL; } @@ -1255,7 +1255,7 @@ int ast_channel_datastore_remove(struct ast_channel *chan, struct ast_datastore return res; } -struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, char *uid) +struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, const char *uid) { struct ast_datastore *datastore = NULL; |