diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-19 17:29:15 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-19 17:29:15 +0000 |
| commit | b741dee519167dba2f3c44b5697b13aaff056046 (patch) | |
| tree | 69ddb238d88df67fbee1173c8726d79820ee0b45 /apps/app_dial.c | |
| parent | d9253cdc8e00672e012fa18f63a8daf53ab00773 (diff) | |
merge two nested 'if' which are really a single block.
(indentation still to be fixed)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@21566 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 40b9e9145..873dcafe3 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1157,10 +1157,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", args.url); ast_channel_sendurl( peer, args.url ); } - if (ast_test_flag(&opts, OPT_PRIVACY) || ast_test_flag(&opts, OPT_SCREENING)) { - int res2; - int loopcount = 0; - if( privdb_val == AST_PRIVACY_UNKNOWN ) { + if ( (ast_test_flag(&opts, OPT_PRIVACY) || ast_test_flag(&opts, OPT_SCREENING)) && privdb_val == AST_PRIVACY_UNKNOWN) { + int res2; + int loopcount = 0; /* Get the user's intro, store it in priv-callerintros/$CID, unless it is already there-- this should be done before the @@ -1340,7 +1339,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags else if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Successfully deleted %s intro file\n", privintro); } - } } if (!ast_test_flag(&opts, OPT_ANNOUNCE) || ast_strlen_zero(opt_args[OPT_ARG_ANNOUNCE])) { res = 0; |