mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-30 13:58:34 +00:00
cr-service.c: rm extra error messages
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:
committed by
Pavel Emelyanov
parent
b0e6ebc1c7
commit
3835ff83c9
12
cr-service.c
12
cr-service.c
@@ -260,10 +260,8 @@ static int dump_using_req(int sk, CriuOpts *req)
|
|||||||
bool success = false;
|
bool success = false;
|
||||||
bool self_dump = !req->pid;
|
bool self_dump = !req->pid;
|
||||||
|
|
||||||
if (setup_opts_from_req(sk, req) == -1) {
|
if (setup_opts_from_req(sk, req))
|
||||||
pr_perror("Arguments treating fail");
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIXME -- cr_dump_tasks() may return code from custom
|
* 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;
|
opts.restore_detach = true;
|
||||||
|
|
||||||
if (setup_opts_from_req(sk, req) == -1) {
|
if (setup_opts_from_req(sk, req))
|
||||||
pr_perror("Arguments treating fail");
|
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
|
||||||
|
|
||||||
if (cr_restore_tasks())
|
if (cr_restore_tasks())
|
||||||
goto exit;
|
goto exit;
|
||||||
@@ -346,10 +342,8 @@ static int pre_dump_using_req(int sk, CriuOpts *opts)
|
|||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
|
|
||||||
if (setup_opts_from_req(sk, opts)) {
|
if (setup_opts_from_req(sk, opts))
|
||||||
pr_perror("Bad options");
|
|
||||||
goto cout;
|
goto cout;
|
||||||
}
|
|
||||||
|
|
||||||
if (cr_pre_dump_tasks(opts->pid))
|
if (cr_pre_dump_tasks(opts->pid))
|
||||||
goto cout;
|
goto cout;
|
||||||
|
Reference in New Issue
Block a user