aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_nbs.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-25 14:32:08 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-25 14:32:08 +0000
commit000e0986072e528276eb7ea9a37728b5b0e6be76 (patch)
treeb186c37b5085861c464a92debbf99dd8c2b71780 /channels/chan_nbs.c
parentc3ad9c9ef53aa9d4297f7c0f009da3c33f50bebc (diff)
apparently developers are still not aware that they should be use ast_copy_string instead of strncpy... fix up many more users, and fix some bugs in the process
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@46200 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_nbs.c')
-rw-r--r--channels/chan_nbs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 30ee32346..6b06529d6 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -129,10 +129,10 @@ static struct nbs_pvt *nbs_alloc(void *data)
{
struct nbs_pvt *p;
int flags = 0;
- char stream[256] = "";
+ char stream[256];
char *opts;
- strncpy(stream, data, sizeof(stream) - 1);
+ ast_copy_string(stream, data, sizeof(stream));
if ((opts = strchr(stream, ':'))) {
*opts = '\0';
opts++;
@@ -153,7 +153,7 @@ static struct nbs_pvt *nbs_alloc(void *data)
} else
flags = NBS_FLAG_OVERSPEAK;
- strncpy(p->stream, stream, sizeof(p->stream) - 1);
+ ast_copy_string(p->stream, stream, sizeof(p->stream));
p->nbs = nbs_newstream("asterisk", stream, flags);
if (!p->nbs) {
ast_log(LOG_WARNING, "Unable to allocate new NBS stream '%s' with flags %d\n", stream, flags);
@@ -246,8 +246,8 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state)
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
- strncpy(tmp->context, context, sizeof(tmp->context)-1);
- strncpy(tmp->exten, "s", sizeof(tmp->exten) - 1);
+ ast_copy_string(tmp->context, context, sizeof(tmp->context));
+ ast_copy_string(tmp->exten, "s", sizeof(tmp->exten));
ast_string_field_set(tmp, language, "");
i->owner = tmp;
i->u = ast_module_user_add(tmp);