kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

More stringfield related changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Fredrickson
2006-02-02 18:33:23 +00:00
parent 35edaf57d6
commit af52e3fd90
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_misdn.c
View File

@@ -58,6 +58,7 @@
#include <asterisk/indications.h> #include <asterisk/indications.h>
#include <asterisk/app.h> #include <asterisk/app.h>
#include <asterisk/features.h> #include <asterisk/features.h>
#include <asterisk/stringfields.h>
#include "chan_misdn_config.h" #include "chan_misdn_config.h"
#include "isdn_lib.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); misdn_cfg_get( port, MISDN_CFG_LANGUAGE, lang, BUFFERSIZE);
ast_copy_string(ast->language, lang, sizeof(ast->language)); ast_string_field_set(ast, language, lang);
ast->language[sizeof(ast->language)]=0;
char localmusicclass[BUFFERSIZE];
char musicclass[BUFFERSIZE];
misdn_cfg_get( port, MISDN_CFG_MUSICCLASS, musicclass, BUFFERSIZE); misdn_cfg_get( port, MISDN_CFG_MUSICCLASS, localmusicclass, BUFFERSIZE);
ast_copy_string(ast->musicclass, musicclass, sizeof(ast->musicclass)); ast_string_field_set(ast, musicclass, localmusicclass);
ast->musicclass[sizeof(ast->musicclass)]=0;
misdn_cfg_get( port, MISDN_CFG_TXGAIN, &bc->txgain, sizeof(int)); 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) { if (c<=0) {
c=glob_channel++; 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); misdn_type, port, c);
} else { } else {
snprintf(tmp->name, sizeof(tmp->name), "%s/%d-%d", ast_string_field_build(tmp, name, "%s/%d-%d",
misdn_type, port, c); misdn_type, port, c);
} }
tmp->type = misdn_type;
tmp->nativeformats = prefformat; tmp->nativeformats = prefformat;
tmp->readformat = format; tmp->readformat = format;

7
channels/chan_nbs.c
View File

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