aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_phone.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-25 14:44:50 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-25 14:44:50 +0000
commit470f688a28975e63c0df4ffdb8a0ac490f4cf3d9 (patch)
treea306715b687622ba9fa6548dc30e79f9c1e1b057 /channels/chan_phone.c
parent6b11ab9b13141b94402e953c33feebcc2e81f542 (diff)
Merged revisions 46200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r46200 | kpfleming | 2006-10-25 09:32:08 -0500 (Wed, 25 Oct 2006) | 2 lines 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/trunk@46201 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
-rw-r--r--channels/chan_phone.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index dbf44f9fc..a165cf2c6 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -313,12 +313,12 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout)
}
/* the standard format of ast->callerid is: "name" <number>, but not always complete */
if (ast_strlen_zero(ast->cid.cid_name))
- strncpy(cid.name, DEFAULT_CALLER_ID, sizeof(cid.name) - 1);
+ strcpy(cid.name, DEFAULT_CALLER_ID);
else
- strncpy(cid.name, ast->cid.cid_name, sizeof(cid.name) - 1);
+ ast_copy_string(cid.name, ast->cid.cid_name, sizeof(cid.name));
if (ast->cid.cid_num)
- strncpy(cid.number, ast->cid.cid_num, sizeof(cid.number) - 1);
+ ast_copy_string(cid.number, ast->cid.cid_num, sizeof(cid.number));
p = ast->tech_pvt;
@@ -873,11 +873,11 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte
if (state == AST_STATE_RING)
tmp->rings = 1;
tmp->tech_pvt = i;
- strncpy(tmp->context, context, sizeof(tmp->context)-1);
+ ast_copy_string(tmp->context, context, sizeof(tmp->context));
if (!ast_strlen_zero(i->ext))
- strncpy(tmp->exten, i->ext, sizeof(tmp->exten)-1);
+ ast_copy_string(tmp->exten, i->ext, sizeof(tmp->exten));
else
- strncpy(tmp->exten, "s", sizeof(tmp->exten) - 1);
+ strcpy(tmp->exten, "s");
if (!ast_strlen_zero(i->language))
ast_string_field_set(tmp, language, i->language);
@@ -1213,15 +1213,15 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain)
tmp->lastinput = -1;
tmp->ministate = 0;
memset(tmp->ext, 0, sizeof(tmp->ext));
- strncpy(tmp->language, language, sizeof(tmp->language)-1);
- strncpy(tmp->dev, iface, sizeof(tmp->dev)-1);
- strncpy(tmp->context, context, sizeof(tmp->context)-1);
+ ast_copy_string(tmp->language, language, sizeof(tmp->language));
+ ast_copy_string(tmp->dev, iface, sizeof(tmp->dev));
+ ast_copy_string(tmp->context, context, sizeof(tmp->context));
tmp->next = NULL;
tmp->obuflen = 0;
tmp->dialtone = 0;
tmp->cpt = 0;
- strncpy(tmp->cid_num, cid_num, sizeof(tmp->cid_num)-1);
- strncpy(tmp->cid_name, cid_name, sizeof(tmp->cid_name)-1);
+ ast_copy_string(tmp->cid_num, cid_num, sizeof(tmp->cid_num));
+ ast_copy_string(tmp->cid_name, cid_name, sizeof(tmp->cid_name));
tmp->txgain = txgain;
ioctl(tmp->fd, PHONE_PLAY_VOLUME, tmp->txgain);
tmp->rxgain = rxgain;
@@ -1392,7 +1392,7 @@ static int load_module(void)
} else if (!strcasecmp(v->name, "silencesupression")) {
silencesupression = ast_true(v->value);
} else if (!strcasecmp(v->name, "language")) {
- strncpy(language, v->value, sizeof(language)-1);
+ ast_copy_string(language, v->value, sizeof(language));
} else if (!strcasecmp(v->name, "callerid")) {
ast_callerid_split(v->value, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
} else if (!strcasecmp(v->name, "mode")) {
@@ -1411,7 +1411,7 @@ static int load_module(void)
else
ast_log(LOG_WARNING, "Unknown mode: %s\n", v->value);
} else if (!strcasecmp(v->name, "context")) {
- strncpy(context, v->value, sizeof(context)-1);
+ ast_copy_string(context, v->value, sizeof(context));
} else if (!strcasecmp(v->name, "format")) {
if (!strcasecmp(v->value, "g723.1")) {
prefformat = AST_FORMAT_G723_1;