From 87fe1834cd1dbfa323da0e092ef4be863a227ccf Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 10 Dec 2012 16:04:46 +0300 Subject: [PATCH] rst: Sanitize restore function call flow The dedicated prepare_and_sigreturn makes code harder to read. Signed-off-by: Pavel Emelyanov --- cr-restore.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cr-restore.c b/cr-restore.c index 0935db067..e57e77256 100644 --- a/cr-restore.c +++ b/cr-restore.c @@ -494,17 +494,6 @@ static int open_vmas(int pid, struct list_head *vmas) return ret < 0 ? -1 : 0; } -static int prepare_and_sigreturn(int pid, CoreEntry *core) -{ - int err; - - err = open_vmas(pid, &rst_vma_list); - if (err) - return err; - - return sigreturn_restore(pid, core); -} - static rt_sigaction_t sigchld_act; static int prepare_sigactions(int pid) { @@ -610,7 +599,10 @@ static int restore_one_alive_task(int pid, CoreEntry *core) log_closedir(); - return prepare_and_sigreturn(pid, core); + if (open_vmas(pid, &rst_vma_list)) + return -1; + + return sigreturn_restore(pid, core); } static void zombie_prepare_signals(void)