From 3835ff83c912e14aad6391cbe06dda13f71094af Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 5 Feb 2014 20:54:00 +0400 Subject: [PATCH] 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 Signed-off-by: Pavel Emelyanov --- cr-service.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cr-service.c b/cr-service.c index 5f7f712bd..99db4f062 100644 --- a/cr-service.c +++ b/cr-service.c @@ -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;