From 4a2c9dd7630ce51a660e1aa14e10bc6fbc4621c4 Mon Sep 17 00:00:00 2001
From: Iliyan Malchev <malchev@google.com>
Date: Mon, 2 Apr 2012 08:20:56 -0700
Subject: replace _exit() with exit()

When the emulator is compiled with -pg, it generates a stats file (gmon.out)
upon exiting, as long as the exit it done when main() returns normally or
exit() is called.  Calling _exit() or exiting via an unhandled signal will not
cause gmon.out to be generated.

Change-Id: I0d5ea5a0b0314f97d2fdc0c92fd6f38c65377eb9
Signed-off-by: Iliyan Malchev <malchev@google.com>
---
 distrib/sdl-1.2.12/src/video/Xext/Xxf86dga/XF86DGA.c | 8 ++++----
 exec.c                                               | 2 +-
 net-android.c                                        | 2 +-
 net.c                                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/distrib/sdl-1.2.12/src/video/Xext/Xxf86dga/XF86DGA.c b/distrib/sdl-1.2.12/src/video/Xext/Xxf86dga/XF86DGA.c
index 346e9e7..34abbb0 100644
--- a/distrib/sdl-1.2.12/src/video/Xext/Xxf86dga/XF86DGA.c
+++ b/distrib/sdl-1.2.12/src/video/Xext/Xxf86dga/XF86DGA.c
@@ -601,9 +601,9 @@ SDL_NAME(XF86DGAForkApp)(int screen)
 	    XSync(sp->display, False);
 	}
         if (WIFEXITED(status))
-	    _exit(0);
+	    exit(0);
 	else
-	    _exit(-1);
+	    exit(-1);
     }
     return pid;
 }
@@ -652,7 +652,7 @@ XF86cleanup(int sig)
     static char beenhere = 0;
 
     if (beenhere)
-	_exit(3);
+	exit(3);
     beenhere = 1;
 
     for (i = 0; i < numScrs; i++) {
@@ -660,7 +660,7 @@ XF86cleanup(int sig)
 	SDL_NAME(XF86DGADirectVideo)(sp->display, sp->screen, 0);
 	XSync(sp->display, False);
     }
-    _exit(3);
+    exit(3);
 }
 
 Bool
diff --git a/exec.c b/exec.c
index b8a473f..c71ef66 100644
--- a/exec.c
+++ b/exec.c
@@ -1527,7 +1527,7 @@ void cpu_set_log(int log_flags)
         logfile = fopen(logfilename, log_append ? "a" : "w");
         if (!logfile) {
             perror(logfilename);
-            _exit(1);
+            exit(1);
         }
 #if !defined(CONFIG_SOFTMMU)
         /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
diff --git a/net-android.c b/net-android.c
index 6459eff..50b816c 100644
--- a/net-android.c
+++ b/net-android.c
@@ -1485,7 +1485,7 @@ static int launch_script(const char *setup_script, const char *ifname, int fd)
         *parg++ = (char *)ifname;
         *parg++ = NULL;
         execv(setup_script, args);
-        _exit(1);
+        exit(1);
     } else if (pid > 0) {
         while (waitpid(pid, &status, 0) != pid) {
             /* loop */
diff --git a/net.c b/net.c
index 1deca85..219ed30 100644
--- a/net.c
+++ b/net.c
@@ -1357,7 +1357,7 @@ static int launch_script(const char *setup_script, const char *ifname, int fd)
         *parg++ = (char *)ifname;
         *parg++ = NULL;
         execv(setup_script, args);
-        _exit(1);
+        exit(1);
     } else if (pid > 0) {
         while (waitpid(pid, &status, 0) != pid) {
             /* loop */
-- 
cgit v1.1