aboutsummaryrefslogtreecommitdiffstats
path: root/capchild/capture_sync.c
diff options
context:
space:
mode:
authorStephan Kappertz <octopus.sk@googlemail.com>2015-11-18 12:13:08 +0100
committerGuy Harris <guy@alum.mit.edu>2015-11-18 18:40:25 +0000
commit5c49facc4f2a9a054258c5921bc68293d6eab3e4 (patch)
tree24547b20eba9622ca86628cf9ff25b185cd5a010 /capchild/capture_sync.c
parent3ca5e3ec7d9ad8c2b1ccb0cf9a5d56a1949766fa (diff)
Error from waitpid(): Fix Code is unreachable
Change-Id: Ib93bd7d62eb16177cfdcb82148c97a64f6e497b4 Reviewed-on: https://code.wireshark.org/review/11939 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capchild/capture_sync.c')
-rw-r--r--capchild/capture_sync.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index 81344be450..b1e1e38f2f 100644
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -2012,12 +2012,12 @@ sync_pipe_wait_for_child(ws_process_id fork_child, gchar **msgp)
fork_child_status);
ret = -1;
}
- } else if (errno != ECHILD) {
- *msgp = g_strdup_printf("Error from waitpid(): %s", g_strerror(errno));
- ret = -1;
} else if (errno == EINTR) {
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_WARNING, "sync_pipe_wait_for_child: waitpid returned EINTR. retrying.");
continue;
+ } else if (errno != ECHILD) {
+ *msgp = g_strdup_printf("Error from waitpid(): %s", g_strerror(errno));
+ ret = -1;
} else {
/* errno == ECHILD ; echld might have already reaped the child */
ret = fetch_dumpcap_pid ? 0 : -1;