[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [xen master] vchan-socket-proxy: Unify main return value
From: patchbot () xen ! org
Date: 2020-06-29 6:34:12
Message-ID: E1jpnMq-00024F-Pj () xenbits ! xenproject ! org
[Download RAW message or body]
commit 2b1a2188111ec3f39de1c6e6ff834e6894d1e05a
Author: Jason Andryuk <jandryuk@gmail.com>
AuthorDate: Wed Jun 10 23:29:31 2020 -0400
Commit: Wei Liu <wl@xen.org>
CommitDate: Fri Jun 26 11:59:49 2020 +0000
vchan-socket-proxy: Unify main return value
Introduce 'ret' for main's return value and remove direct returns. This
is in preparation for a unified exit path with resource cleanup.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Acked-by: Wei Liu <wl@xen.org>
Reviewed-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Release-acked-by: Paul Durrant <paul@xen.org>
---
tools/libvchan/vchan-socket-proxy.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/tools/libvchan/vchan-socket-proxy.c b/tools/libvchan/vchan-socket-proxy.c
index 196f6016b9..36a2fe2cb8 100644
--- a/tools/libvchan/vchan-socket-proxy.c
+++ b/tools/libvchan/vchan-socket-proxy.c
@@ -388,6 +388,7 @@ int main(int argc, char **argv)
const char *vchan_path;
const char *state_path = NULL;
int opt;
+ int ret;
while ((opt = getopt_long(argc, argv, "m:vs:", options, NULL)) != -1) {
switch (opt) {
@@ -454,6 +455,8 @@ int main(int argc, char **argv)
xs_close(xs);
}
+ ret = 0;
+
for (;;) {
if (is_server) {
/* wait for vchan connection */
@@ -468,7 +471,8 @@ int main(int argc, char **argv)
}
if (input_fd == -1) {
fprintf(stderr, "connect_socket failed\n");
- return 1;
+ ret = 1;
+ break;
}
if (data_loop(ctrl, input_fd, output_fd) != 0)
break;
@@ -481,14 +485,16 @@ int main(int argc, char **argv)
input_fd = output_fd = accept(socket_fd, NULL, NULL);
if (input_fd == -1) {
perror("accept");
- return 1;
+ ret = 1;
+ break;
}
set_nonblocking(input_fd, 1);
set_nonblocking(output_fd, 1);
ctrl = connect_vchan(domid, vchan_path);
if (!ctrl) {
perror("vchan client init");
- return 1;
+ ret = 1;
+ break;
}
if (data_loop(ctrl, input_fd, output_fd) != 0)
break;
@@ -500,5 +506,6 @@ int main(int argc, char **argv)
ctrl = NULL;
}
}
- return 0;
+
+ return ret;
}
--
generated by git-patchbot for /home/xen/git/xen.git#master
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic