[asterisk-commits] qwell: trunk r68575 - /trunk/channels/chan_misdn.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Fri Jun  8 20:06:40 2007
New Revision: 68575

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68575
Log:
Fix compile errors in chan_misdn.c

Reported by d1mas in #asterisk-bugs on IRC.

Modified:
    trunk/channels/chan_misdn.c

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=68575&r1=68574&r2=68575
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Fri Jun  8 20:06:40 2007
@@ -75,6 +75,7 @@
 #include "asterisk/term.h"
 #include "asterisk/sched.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/causes.h"
 
 #include "chan_misdn_config.h"
 #include "isdn_lib.h"
@@ -1973,10 +1974,7 @@
 		ast_copy_string(newbc->dad, ext, sizeof(newbc->dad));
 	}
 
-	if (!ast_strlen_zero(ast->cid.cid_rdnis))
-		ast_copy_string(newbc->rad, ast->cid.cid_rdnis, sizeof(newbc->rad));
-	else 
-		newbc->rad = "";
+	ast_copy_string(newbc->rad, S_OR(ast->cid.cid_rdnis, ""), sizeof(newbc->rad));
 
 	chan_misdn_log(3, port, " --> * adding2newbc callerid %s\n", ast->cid.cid_num);
 	if (ast_strlen_zero(newbc->oad) && !ast_strlen_zero(ast->cid.cid_num)) {
@@ -2070,8 +2068,6 @@
 	} else {
 		chan_misdn_log(3, p->bc->port, " --> Connection is without BF encryption\n");
 	}
-
-	{
 
 	tmp = pbx_builtin_getvar_helper(ast, "MISDN_DIGITAL_TRANS");
 	if (!ast_strlen_zero(tmp) && ast_true(tmp)) {
@@ -4157,7 +4153,7 @@
 
 			if (!ch->ast)
 				break;
-			ast_copy_string(ch->ast->exten, bc->dad, l, sizeof(ch->ast->exten));
+			ast_copy_string(ch->ast->exten, bc->dad, sizeof(ch->ast->exten));
 			ast_copy_string(bc->info_dad, bc->infos_pending, sizeof(bc->info_dad));
 			ast_copy_string(bc->infos_pending, "", sizeof(bc->infos_pending));
 
@@ -4351,6 +4347,8 @@
 		switch (ch->state) {
 		case MISDN_CALLING:
 			bc->cause = AST_CAUSE_DESTINATION_OUT_OF_ORDER;
+			break;
+		default:
 			break;
 		}
 		
@@ -4739,8 +4737,6 @@
 	if (!ast_strlen_zero(ports))
 		chan_misdn_log(0, 0, "Got: %s from get_ports\n", ports);
 
-	{
-		
 	if (misdn_lib_init(ports, &iface, NULL))
 		chan_misdn_log(0, 0, "No te ports initialized\n");