[Asterisk-code-review] main/asterisk.c: Reverse #if statement in listener() to fix ... (asterisk[13])

Corey Farrell asteriskteam at digium.com
Fri Feb 12 08:37:20 CST 2016


Corey Farrell has uploaded a new change for review.

  https://gerrit.asterisk.org/2243

Change subject: main/asterisk.c: Reverse #if statement in listener() to fix code folding.
......................................................................

main/asterisk.c: Reverse #if statement in listener() to fix code folding.

listener() opens the same code block in two places (#if and #else).  This
confuses some folding editors causing it to think that an extra code block
was opened.  Folding in 'geany' causes all code after listener() to be
folded as if it were part of that procedure.

ASTERISK-24813 #close

Change-Id: I4b8c766e6c91e327dd445e8c18f8a6f268acd961
---
M main/asterisk.c
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/43/2243/1

diff --git a/main/asterisk.c b/main/asterisk.c
index d99aaed..0cecc51 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1608,15 +1608,14 @@
 			if (errno != EINTR)
 				ast_log(LOG_WARNING, "Accept returned %d: %s\n", s, strerror(errno));
 		} else {
-#if !defined(SO_PASSCRED)
-			{
-#else
+#if defined(SO_PASSCRED)
 			int sckopt = 1;
 			/* turn on socket credentials passing. */
 			if (setsockopt(s, SOL_SOCKET, SO_PASSCRED, &sckopt, sizeof(sckopt)) < 0) {
 				ast_log(LOG_WARNING, "Unable to turn on socket credentials passing\n");
-			} else {
+			} else
 #endif
+			{
 				for (x = 0; x < AST_MAX_CONNECTS; x++) {
 					if (consoles[x].fd >= 0) {
 						continue;

-- 
To view, visit https://gerrit.asterisk.org/2243
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b8c766e6c91e327dd445e8c18f8a6f268acd961
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Corey Farrell <git at cfware.com>



More information about the asterisk-code-review mailing list