From fe9fff6dcbd717ce674c82efd8e64755469f455f Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 8 Jun 2006 22:34:25 +0000
Subject: [PATCH] revert change that didn't actually change anything, and fix
 formatting of conditional expression so it's more clear what it does

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@352 2fbb986a-6c06-0410-b554-c9c1f0a7f128
---
 q931.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/q931.c b/q931.c
index acb1961..992e111 100644
--- a/q931.c
+++ b/q931.c
@@ -1061,12 +1061,9 @@ static FUNC_SEND(transmit_display)
 {
 	int i;
 	
-	if (!call->callername[0])
-		return 0;
-
-	if ((pri->switchtype == PRI_SWITCH_QSIG)
-		|| ((pri->switchtype == PRI_SWITCH_EUROISDN_E1) && (pri->localtype == PRI_CPE)) ||
-		!call->callername[0])
+	if ((pri->switchtype == PRI_SWITCH_QSIG) ||
+	    ((pri->switchtype == PRI_SWITCH_EUROISDN_E1) && (pri->localtype == PRI_CPE)) ||
+	    !call->callername[0])
 		return 0;
 
 	i = 0;