[Asterisk-cvs] asterisk cdr.c,1.47,1.48

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv17140

Modified Files:
	cdr.c 
Log Message:
super crazy ast_copy_string conversion madness!


Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- cdr.c	7 Jul 2005 22:32:20 -0000	1.47
+++ cdr.c	7 Jul 2005 23:46:10 -0000	1.48
@@ -578,9 +578,9 @@
 			if (c->cid.cid_name && num)
 				snprintf(tmp, sizeof(tmp), "\"%s\" <%s>", c->cid.cid_name, num);
 			else if (c->cid.cid_name)
-				strncpy(tmp, c->cid.cid_name, sizeof(tmp) - 1);
+				ast_copy_string(tmp, c->cid.cid_name, sizeof(tmp));
 			else if (num)
-				strncpy(tmp, num, sizeof(tmp) - 1);
+				ast_copy_string(tmp, num, sizeof(tmp));
 			ast_copy_string(cdr->clid, tmp, sizeof(cdr->clid));
 			ast_copy_string(cdr->src, num ? num : "", sizeof(cdr->src));
 		}
@@ -609,9 +609,9 @@
 			if (c->cid.cid_name && num)
 				snprintf(tmp, sizeof(tmp), "\"%s\" <%s>", c->cid.cid_name, num);
 			else if (c->cid.cid_name)
-				strncpy(tmp, c->cid.cid_name, sizeof(tmp) - 1);
+				ast_copy_string(tmp, c->cid.cid_name, sizeof(tmp));
 			else if (num)
-				strncpy(tmp, num, sizeof(tmp) - 1);
+				ast_copy_string(tmp, num, sizeof(tmp));
 			ast_copy_string(cdr->clid, tmp, sizeof(cdr->clid));
 			ast_copy_string(cdr->src, num ? num : "", sizeof(cdr->src));
 
@@ -740,9 +740,9 @@
 			if (c->cid.cid_name && num)
 				snprintf(tmp, sizeof(tmp), "\"%s\" <%s>", c->cid.cid_name, num);
 			else if (c->cid.cid_name)
-				strncpy(tmp, c->cid.cid_name, sizeof(tmp) - 1);
+				ast_copy_string(tmp, c->cid.cid_name, sizeof(tmp));
 			else if (num)
-				strncpy(tmp, num, sizeof(tmp) - 1);
+				ast_copy_string(tmp, num, sizeof(tmp));
 			ast_copy_string(cdr->clid, tmp, sizeof(cdr->clid));
 			ast_copy_string(cdr->src, num ? num : "", sizeof(cdr->src));