]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
main/asterisk.c: Reverse #if statement in listener() to fix code folding. 44/2244/1
authorCorey Farrell <git@cfware.com>
Sat, 21 Feb 2015 02:51:35 +0000 (02:51 +0000)
committerCorey Farrell <git@cfware.com>
Fri, 12 Feb 2016 14:37:47 +0000 (08:37 -0600)
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

main/asterisk.c

index 7745d3f21e6cb9fba20c008d4d61517af6938013..16c0c342d0e3433fc02ddc60e8fd298f0cf089be 100644 (file)
@@ -1452,15 +1452,14 @@ static void *listener(void *unused)
                        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;