From b3343aecdfcae5cb9bc8eabe1c5cb5e7de85204e Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 19 Apr 2006 17:29:15 +0000
Subject: [PATCH] merge two nested 'if' which are really a single block.
(indentation still to be fixed)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_dial.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 40b9e9145e..873dcafe31 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;
--
GitLab