Factor `}' out of #if/...}/#else...}/#endif, so Emacs can match `{' against `}'

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 59a75c86cca4e15abc7cd58b9fda72d7b681b332..15a8bf8efa71cb531cdc2dd5c510ffd30134e8aa 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -481,6 +481,7 @@ slapd_daemon_task(
                                FD_CLR( writefds.fd_array[i], &readfds );
                                slapd_close( writefds.fd_array[i] );
                        }
+               }
 #else
                for ( i = 0; i < nfds; i++ ) {
                        if ( i == tcps ) {
@@ -500,9 +501,9 @@ slapd_daemon_task(
                                        slapd_close( i );
                                }
                        }
+               }
 #endif
 
-               }
 #ifdef HAVE_WINSOCK
                for ( i = 0; i < readfds.fd_count; i++ ) {
                        if ( readfds.fd_array[i] == tcps ) {

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index e83978cc43749f5fc58ff60f6dd66ef5de083e75..b18db5651ca97b33b6f1cb3710100a6307d063f3 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -106,10 +106,11 @@ main( int argc, char **argv )
                switch ( i ) {
                case 'a':       /* bind address */
 #ifdef HAVE_WINSOCK
-                       if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg))) {
+                       if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg)))
 #else
-                       if(!inet_aton(optarg, &bind_addr.sin_addr)) {
+                       if(!inet_aton(optarg, &bind_addr.sin_addr))
 #endif
+                       {
                                fprintf(stderr, "invalid address (%s) for -a option", optarg);
                        }
             break;

diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c
index 08935704fc2395a846775707aaaa3733d7d64082..5f24ac54c55a05963585c58ee57f4ea46beefddc 100644 (file)
--- a/servers/slapd/tools/ldbmtest.c
+++ b/servers/slapd/tools/ldbmtest.c
@@ -545,10 +545,11 @@ edit_entry( char c, Datum *data )
        fclose( fp );
  
 #ifdef HAVE_WAITPID
-       if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) {
+       if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 )
 #else
-       if ( wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) {
+       if ( wait3( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 )
 #endif
+       {
                perror( "wait" );
                return;
        }