diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-01 23:05:28 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-01 23:05:28 +0000 |
| commit | a16ae226b685a8c434ec4f7eecf4ee8864fde4c7 (patch) | |
| tree | 86a6664b5cba70b924fdd1cef2ecbf93226e7d58 /res/res_musiconhold.c | |
| parent | f246b9fc64ea8843f419947045574edb2681f9a2 (diff) | |
use string fields for some stuff in ast_channel
const-ify some more APIs
remove 'type' field from ast_channel, in favor of the one in the channel's tech structure
allow string field module users to specify the 'chunk size' for pool allocations
update chan_alsa to be compatible with recent const-ification patches
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 7ab065a5c..9b61264bb 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -64,6 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/config.h" #include "asterisk/utils.h" #include "asterisk/cli.h" +#include "asterisk/stringfields.h" #define MAX_MOHFILES 512 #define MAX_MOHFILE_LEN 128 @@ -573,7 +574,7 @@ static int moh2_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n"); return -1; } - strncpy(chan->musicclass, data, sizeof(chan->musicclass) - 1); + ast_string_field_set(chan, musicclass, data); return 0; } @@ -595,7 +596,7 @@ static int moh4_exec(struct ast_channel *chan, void *data) return 0; } -static struct mohclass *get_mohbyname(char *name) +static struct mohclass *get_mohbyname(const char *name) { struct mohclass *moh; moh = mohclasses; @@ -862,7 +863,7 @@ static void local_ast_moh_cleanup(struct ast_channel *chan) } } -static int local_ast_moh_start(struct ast_channel *chan, char *class) +static int local_ast_moh_start(struct ast_channel *chan, const char *class) { struct mohclass *mohclass; |