[CRIU] [PATCH] service: don't use name "opts" for CriuOpts

Ruslan Kuprieiev kupruser at gmail.com
Thu Feb 20 05:45:08 PST 2014


As we have global variable opts, it is bad to use
local var with the same name.

Signed-off-by: Ruslan Kuprieiev <kupruser at gmail.com>
---
 cr-service.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cr-service.c b/cr-service.c
index 9688b76..bfb856f 100644
--- a/cr-service.c
+++ b/cr-service.c
@@ -348,7 +348,7 @@ static int check(int sk)
 	return send_criu_msg(sk, &resp);
 }
 
-static int pre_dump_using_req(int sk, CriuOpts *opts)
+static int pre_dump_using_req(int sk, CriuOpts *req)
 {
 	int pid, status;
 	bool success = false;
@@ -362,10 +362,10 @@ static int pre_dump_using_req(int sk, CriuOpts *opts)
 	if (pid == 0) {
 		int ret = 1;
 
-		if (setup_opts_from_req(sk, opts))
+		if (setup_opts_from_req(sk, req))
 			goto cout;
 
-		if (cr_pre_dump_tasks(opts->pid))
+		if (cr_pre_dump_tasks(req->pid))
 			goto cout;
 
 		ret = 0;
@@ -413,19 +413,19 @@ static int pre_dump_loop(int sk, CriuReq *msg)
 	return dump_using_req(sk, msg->opts);
 }
 
-static int start_page_server_req(int sk, CriuOpts *opts)
+static int start_page_server_req(int sk, CriuOpts *req)
 {
 	int ret;
 	bool success = false;
 	CriuResp resp = CRIU_RESP__INIT;
 	CriuPageServerInfo ps = CRIU_PAGE_SERVER_INFO__INIT;
 
-	if (!opts->ps) {
+	if (!req->ps) {
 		pr_err("No page server info in message\n");
 		goto out;
 	}
 
-	if (setup_opts_from_req(sk, opts))
+	if (setup_opts_from_req(sk, req))
 		goto out;
 
 	pr_debug("Starting page server\n");
-- 
1.8.3.2



More information about the CRIU mailing list