]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
vmspawn: get rid of an unnecessary local variable 33697/head
authorLennart Poettering <lennart@poettering.net>
Thu, 11 Jul 2024 12:34:42 +0000 (14:34 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 12 Jul 2024 04:27:45 +0000 (06:27 +0200)
src/vmspawn/vmspawn.c

index 77100f59c2c8c2c9a655b4c3b38870406873ed21..cb42085d76ff34c460950fdf05f92a506c17633b 100644 (file)
@@ -582,24 +582,20 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 static int open_vsock(void) {
-        _cleanup_close_ int vsock_fd = -EBADF;
-        int r;
         static const union sockaddr_union bind_addr = {
                 .vm.svm_family = AF_VSOCK,
                 .vm.svm_cid = VMADDR_CID_ANY,
                 .vm.svm_port = VMADDR_PORT_ANY,
         };
 
-        vsock_fd = socket(AF_VSOCK, SOCK_STREAM|SOCK_CLOEXEC, 0);
+        _cleanup_close_ int vsock_fd = socket(AF_VSOCK, SOCK_STREAM|SOCK_CLOEXEC, 0);
         if (vsock_fd < 0)
                 return log_error_errno(errno, "Failed to open AF_VSOCK socket: %m");
 
-        r = bind(vsock_fd, &bind_addr.sa, sizeof(bind_addr.vm));
-        if (r < 0)
+        if (bind(vsock_fd, &bind_addr.sa, sizeof(bind_addr.vm)) < 0)
                 return log_error_errno(errno, "Failed to bind to VSOCK address %u:%u: %m", bind_addr.vm.svm_cid, bind_addr.vm.svm_port);
 
-        r = listen(vsock_fd, SOMAXCONN_DELUXE);
-        if (r < 0)
+        if (listen(vsock_fd, SOMAXCONN_DELUXE) < 0)
                 return log_error_errno(errno, "Failed to listen on VSOCK: %m");
 
         return TAKE_FD(vsock_fd);