From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Mon, 26 Oct 2009 11:34:06 +0000 (+0000)
Subject: Re-arange code a bit to build in dev-mode without ss7
X-Git-Tag: 11.0.0-beta1~3978
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5a57959eb877520fae8fd7db5eeebc8c5ae14e4;p=thirdparty%2Fasterisk.git

Re-arange code a bit to build in dev-mode without ss7

No change of functionality here. Just localized a variable and indented
code into blocks.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 65c8e41595..ff48aea6b4 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -4085,7 +4085,6 @@ static int update_conf(struct dahdi_pvt *p)
 
 static void dahdi_enable_ec(struct dahdi_pvt *p)
 {
-	int x;
 	int res;
 	if (!p)
 		return;
@@ -4112,10 +4111,15 @@ static void dahdi_enable_ec(struct dahdi_pvt *p)
 			/* Fall through */
 #ifdef HAVE_SS7
 		case SIG_SS7:
-			x = 1;
-			res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x);
-			if (res)
-				ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
+			{
+				int x = 1;
+				res = ioctl(p->subs[SUB_REAL].dfd, 
+						DAHDI_AUDIOMODE, &x);
+				if (res)
+					ast_log(LOG_WARNING, 
+							"Unable to enable audio mode on channel %d (%s)\n",
+							p->channel, strerror(errno));
+			}
 #endif
 			break;
 		default:
@@ -4361,7 +4365,7 @@ static inline int dahdi_set_hook(int fd, int hs)
 
 static inline int dahdi_confmute(struct dahdi_pvt *p, int muted)
 {
-	int x, y, res;
+	int x, res;
 
 	x = muted;
 	switch (p->sig) {
@@ -4375,10 +4379,13 @@ static inline int dahdi_confmute(struct dahdi_pvt *p, int muted)
 		/* Fall through */
 #ifdef HAVE_SS7
 	case SIG_SS7:
-		y = 1;
-		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &y);
-		if (res)
-			ast_log(LOG_WARNING, "Unable to set audio mode on %d: %s\n", p->channel, strerror(errno));
+		{
+			int y = 1;
+			res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &y);
+			if (res)
+				ast_log(LOG_WARNING, "Unable to set audio mode on %d: %s\n", 
+						p->channel, strerror(errno));
+		}
 #endif
 		break;
 	default: