[svn-commits] rmudgett: branch group/issue8824 r160852 - /team/group/issue8824/funcs/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Dec  3 18:12:40 2008
New Revision: 160852

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160852
Log:
Added curly braces and minor tweaks

Modified:
    team/group/issue8824/funcs/func_callerid.c

Modified: team/group/issue8824/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/funcs/func_callerid.c?view=diff&rev=160852&r1=160851&r2=160852
==============================================================================
--- team/group/issue8824/funcs/func_callerid.c (original)
+++ team/group/issue8824/funcs/func_callerid.c Wed Dec  3 18:12:40 2008
@@ -197,36 +197,40 @@
 		char name[256];
 		char num[256];
 
-		if (!ast_callerid_split(value, name, sizeof(name), num, sizeof(num))) {
-			ast_set_callerid(chan, num, name, num);
-			if (chan->cdr)
-				ast_cdr_setcid(chan->cdr, chan);
+		ast_callerid_split(value, name, sizeof(name), num, sizeof(num));
+		ast_set_callerid(chan, num, name, num);
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
 		}
 	} else if (!strncasecmp("name", data, 4)) {
 		ast_set_callerid(chan, NULL, value, NULL);
-		if (chan->cdr)
-			ast_cdr_setcid(chan->cdr, chan);
-	} else if (!strncasecmp("num", data, 3) ||
-		   !strncasecmp("number", data, 6)) {
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
+		}
+	} else if (!strncasecmp("num", data, 3)
+		|| !strncasecmp("number", data, 6)) {
 		ast_set_callerid(chan, value, NULL, NULL);
-		if (chan->cdr)
-			ast_cdr_setcid(chan->cdr, chan);
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
+		}
 	} else if (!strncasecmp("ani", data, 3)) {
 		if (!strncasecmp(data + 3, "2", 1)) {
 			chan->cid.cid_ani2 = atoi(value);
 		} else {
 			ast_set_callerid(chan, NULL, NULL, value);
 		}
-		if (chan->cdr)
-			ast_cdr_setcid(chan->cdr, chan);
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
+		}
 	} else if (!strncasecmp("dnid", data, 4)) {
 		ast_channel_lock(chan);
 		if (chan->cid.cid_dnid) {
 			ast_free(chan->cid.cid_dnid);
 		}
 		chan->cid.cid_dnid = ast_strdup(value);
-		if (chan->cdr)
-			ast_cdr_setcid(chan->cdr, chan);
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
+		}
 		ast_channel_unlock(chan);
 	} else if (!strncasecmp("rdnis", data, 5)) {
 		ast_channel_lock(chan);
@@ -234,8 +238,9 @@
 			ast_free(chan->cid.cid_rdnis);
 		}
 		chan->cid.cid_rdnis = ast_strdup(value);
-		if (chan->cdr)
-			ast_cdr_setcid(chan->cdr, chan);
+		if (chan->cdr) {
+			ast_cdr_setcid(chan->cdr, chan);
+		}
 		ast_channel_unlock(chan);
 	} else if (!strncasecmp("pres", data, 4)) {
 		int i;