[Asterisk-cvs] asterisk callerid.c,1.5,1.6 frame.c,1.8,1.9

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv18849

Modified Files:
	callerid.c frame.c 
Log Message:
Callerid fix and warning cleanup (bug #367 & #356)


Index: callerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/callerid.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- callerid.c	1 Sep 2003 15:59:57 -0000	1.5
+++ callerid.c	8 Oct 2003 21:57:43 -0000	1.6
@@ -110,8 +110,8 @@
 {
 	struct callerid_state *cid;
 	cid = malloc(sizeof(struct callerid_state));
-	memset(cid, 0, sizeof(struct callerid_state));
 	if (cid) {
+		memset(cid, 0, sizeof(struct callerid_state));
 		cid->fskd.spb = 7;		/* 1200 baud */
 		cid->fskd.hdlc = 0;		/* Async */
 		cid->fskd.nbit = 8;		/* 8 bits */

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- frame.c	5 Oct 2003 22:17:32 -0000	1.8
+++ frame.c	8 Oct 2003 21:57:43 -0000	1.9
@@ -455,8 +455,7 @@
 		return RESULT_SHOWUSAGE;
 
 	if (getenv("I_AM_NOT_AN_IDIOT") == NULL)
-		ast_cli(fd, "Disclaimer: this command is for informational purposes
-only.\n\tIt does not indicate anything about your configuration.\n");
+		ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n\tIt does not indicate anything about your configuration.\n");
 
 	if ((argc == 2) || (!strcasecmp(argv[1],"audio"))) {
 		found = 1;