]> granicus.if.org Git - apache/commitdiff
event: child_main() never returns, so remove some dead code after
authorJeff Trawick <trawick@apache.org>
Thu, 3 Mar 2011 18:37:41 +0000 (18:37 +0000)
committerJeff Trawick <trawick@apache.org>
Thu, 3 Mar 2011 18:37:41 +0000 (18:37 +0000)
one of the calls

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1076718 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/event/event.c

index b7c7c4f9e43ac93357df7cd6b970c51f89a16768..18e9ad22ef66880a2626d155bdab65bfe2108242 100644 (file)
@@ -1835,6 +1835,7 @@ static int make_child(server_rec * s, int slot)
         set_signals();
         ap_scoreboard_image->parent[slot].pid = getpid();
         child_main(slot);
+        /* NOTREACHED */
     }
 
     if ((pid = fork()) == -1) {
@@ -1872,8 +1873,7 @@ static int make_child(server_rec * s, int slot)
 
         apr_signal(SIGTERM, just_die);
         child_main(slot);
-
-        clean_child_exit(0);
+        /* NOTREACHED */
     }
     /* else */
     if (ap_scoreboard_image->parent[slot].pid != 0) {