[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-04-19 13:01:11
Message-ID: 1240146071.935827.31451.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 956154 by ossi:

localize the accepted_fd setup more to the relevant code for clarity

 M  +2 -7      kinit.cpp  


--- trunk/KDE/kdelibs/kinit/kinit.cpp #956153:956154
@@ -1022,10 +1022,6 @@
        sock = d.launcher[0];
        launcher = true;
    }
-   else
-   {
-       d.accepted_fd = sock;
-   }
 
    klauncher_header request_header;
    char *request_data = 0L;
@@ -1291,9 +1287,6 @@
       }
       while( exit_pid > 0);
 
-      /* Set up the next loop */
-      d.accepted_fd = -1;
-
       FD_ZERO(&rd_set);
       FD_ZERO(&wr_set);
       FD_ZERO(&e_set);
@@ -1318,8 +1311,10 @@
          int sock = accept(d.wrapper, (struct sockaddr *)&client, &sClient);
          if (sock >= 0)
          {
+            d.accepted_fd = sock;
             handle_launcher_request(sock);
             close(sock);
+            d.accepted_fd = -1;
          }
       }
 

[prev in list] [next in list] [prev in thread] [next in thread]