mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

cr-service.c: rm extra error messages

Browse Source 
setup_opts_from_req() prints an error message, so there's no need
for its caller to print another one.

While at it, simplify/unify error checking, treating any
non-zero value as an error.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin 2014-02-05 20:54:00 +04:00 committed by Pavel Emelyanov
parent b0e6ebc1c7
commit 3835ff83c9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cr-service.c
View File

@ -260,10 +260,8 @@ static int dump_using_req(int sk, CriuOpts *req)
bool success = false;
bool self_dump = !req->pid;
if (setup_opts_from_req(sk, req) == -1) {
pr_perror("Arguments treating fail");
if (setup_opts_from_req(sk, req))
goto exit;
}
/*
* FIXME -- cr_dump_tasks() may return code from custom
@ -298,10 +296,8 @@ static int restore_using_req(int sk, CriuOpts *req)
opts.restore_detach = true;
if (setup_opts_from_req(sk, req) == -1) {
pr_perror("Arguments treating fail");
if (setup_opts_from_req(sk, req))
goto exit;
}
if (cr_restore_tasks())
goto exit;
@ -346,10 +342,8 @@ static int pre_dump_using_req(int sk, CriuOpts *opts)
if (pid == 0) {
int ret = 1;
if (setup_opts_from_req(sk, opts)) {
pr_perror("Bad options");
if (setup_opts_from_req(sk, opts))
goto cout;
}
if (cr_pre_dump_tasks(opts->pid))
goto cout;