More stringfield related changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9085 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 0823310..c95eddb 100644 (file)
--- 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;

diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 380cb3b..8cb4180 100644 (file)
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 
 static const char desc[] = "Network Broadcast Sound Support";
-static const char type[] = "NBS";
 static const char tdesc[] = "Network Broadcast Sound Driver";
 
 static int usecnt =0;
@@ -62,6 +61,7 @@ static int prefformat = AST_FORMAT_SLINEAR;
 AST_MUTEX_DEFINE_STATIC(usecnt_lock);
 
 static char context[AST_MAX_EXTENSION] = "default";
+static char type[] = "NBS";
 
 /* NBS creates private structures on demand */
    
@@ -233,8 +233,7 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state)
        tmp = ast_channel_alloc(1);
        if (tmp) {
                tmp->tech = &nbs_tech;
-               snprintf(tmp->name, sizeof(tmp->name), "NBS/%s", i->stream);
-               tmp->type = type;
+               ast_string_field_build(tmp, name, "NBS/%s", i->stream);
                tmp->fds[0] = nbs_fd(i->nbs);
                tmp->nativeformats = prefformat;
                tmp->rawreadformat = prefformat;
@@ -247,7 +246,7 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state)
                tmp->tech_pvt = i;
                strncpy(tmp->context, context, sizeof(tmp->context)-1);
                strncpy(tmp->exten, "s",  sizeof(tmp->exten) - 1);
-               tmp->language[0] = '\0';
+               ast_string_field_set(tmp, language, "");
                i->owner = tmp;
                ast_mutex_lock(&usecnt_lock);
                usecnt++;