[asterisk-commits] rmudgett: trunk r355055 - /trunk/channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Feb 13 15:36:26 2012
New Revision: 355055

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=355055
Log:
Fix compile error from most recent ast_channel constification installment.

Modified:
    trunk/channels/chan_misdn.c

Modified: trunk/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=355055&r1=355054&r2=355055
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Feb 13 15:36:26 2012
@@ -7280,10 +7280,10 @@
 			switch (tmp->faxdetect) {
 			case 1:
 				if (strcmp(ast_channel_exten(ast), "fax")) {
-					char *context;
+					const char *context;
 					char context_tmp[BUFFERSIZE];
 					misdn_cfg_get(tmp->bc->port, MISDN_CFG_FAXDETECT_CONTEXT, &context_tmp, sizeof(context_tmp));
-					context = ast_strlen_zero(context_tmp) ? (ast_strlen_zero(ast_channel_macrocontext(ast)) ? ast_channel_context(ast) : ast_channel_macrocontext(ast)) : context_tmp;
+					context = S_OR(context_tmp, S_OR(ast_channel_macrocontext(ast), ast_channel_context(ast)));
 					if (ast_exists_extension(ast, context, "fax", 1,
 						S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, NULL))) {
 						ast_verb(3, "Redirecting %s to fax extension (context:%s)\n", ast_channel_name(ast), context);