diff options
author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-02 18:33:23 +0000 |
---|---|---|
committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-02 18:33:23 +0000 |
commit | faffb3f5bca397ce6a57a9e14aedc1e9888a8aeb (patch) | |
tree | e203500f84dc2a25fce926a5aa6af688e595f255 /channels/chan_misdn.c | |
parent | 4f0e946c0cc051e79e4eb229d8993534086bcd9b (diff) |
More stringfield related changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9085 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r-- | channels/chan_misdn.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 0823310bd..c95eddbbf 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -58,6 +58,7 @@ #include <asterisk/indications.h> #include <asterisk/app.h> #include <asterisk/features.h> +#include <asterisk/stringfields.h> #include "chan_misdn_config.h" #include "isdn_lib.h" @@ -1081,15 +1082,12 @@ static int read_config(struct chan_list *ch, int orig) { misdn_cfg_get( port, MISDN_CFG_LANGUAGE, lang, BUFFERSIZE); - ast_copy_string(ast->language, lang, sizeof(ast->language)); - ast->language[sizeof(ast->language)]=0; + ast_string_field_set(ast, language, lang); - - char musicclass[BUFFERSIZE]; + char localmusicclass[BUFFERSIZE]; - misdn_cfg_get( port, MISDN_CFG_MUSICCLASS, musicclass, BUFFERSIZE); - ast_copy_string(ast->musicclass, musicclass, sizeof(ast->musicclass)); - ast->musicclass[sizeof(ast->musicclass)]=0; + misdn_cfg_get( port, MISDN_CFG_MUSICCLASS, localmusicclass, BUFFERSIZE); + ast_string_field_set(ast, musicclass, localmusicclass); misdn_cfg_get( port, MISDN_CFG_TXGAIN, &bc->txgain, sizeof(int)); @@ -2314,15 +2312,13 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char if (c<=0) { c=glob_channel++; - snprintf(tmp->name, sizeof(tmp->name), "%s/%d-u%d", + ast_string_field_build(tmp, name, "%s/%d-u%d", misdn_type, port, c); } else { - snprintf(tmp->name, sizeof(tmp->name), "%s/%d-%d", + ast_string_field_build(tmp, name, "%s/%d-%d", misdn_type, port, c); } - tmp->type = misdn_type; - tmp->nativeformats = prefformat; tmp->readformat = format; |