merge from 2_2
authorAndrew Tridgell <tridge@samba.org>
Wed, 25 Apr 2001 01:52:54 +0000 (01:52 +0000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 25 Apr 2001 01:52:54 +0000 (01:52 +0000)
source/nsswitch/wb_common.c

index 3671cf2e4fbf10095a4e7fe00664c3fbb8ea5a6b..98a4b6758bc01a826f33cb2f8244b6348efa9543 100644 (file)
@@ -168,7 +168,6 @@ int write_sock(void *buffer, int count)
        while(nwritten < count) {
                struct timeval tv;
                fd_set r_fds;
        while(nwritten < count) {
                struct timeval tv;
                fd_set r_fds;
-               int selret;
                
                /* Catch pipe close on other end by checking if a read()
                   call would not block by calling select(). */
                
                /* Catch pipe close on other end by checking if a read()
                   call would not block by calling select(). */
@@ -177,8 +176,8 @@ int write_sock(void *buffer, int count)
                FD_SET(established_socket, &r_fds);
                ZERO_STRUCT(tv);
                
                FD_SET(established_socket, &r_fds);
                ZERO_STRUCT(tv);
                
-               if ((selret = select(established_socket + 1, &r_fds, 
-                                    NULL, NULL, &tv)) == -1) {
+               if (select(established_socket + 1, &r_fds, 
+                                    NULL, NULL, &tv) == -1) {
                        close_sock();
                        return -1;                   /* Select error */
                }
                        close_sock();
                        return -1;                   /* Select error */
                }