chiark / gitweb /
user-sessions: modernizations
authorLennart Poettering <lennart@poettering.net>
Mon, 4 Nov 2013 23:53:19 +0000 (00:53 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Nov 2013 00:13:05 +0000 (01:13 +0100)
src/login/user-sessions.c

index 45fb427..ca5de41 100644 (file)
@@ -28,7 +28,6 @@
 #include "fileio.h"
 
 int main(int argc, char*argv[]) {
-        int ret = EXIT_FAILURE;
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
@@ -42,7 +41,7 @@ int main(int argc, char*argv[]) {
         umask(0022);
 
         if (streq(argv[1], "start")) {
-                int q = 0, r = 0;
+                int r = 0;
 
                 if (unlink("/run/nologin") < 0 && errno != ENOENT) {
                         log_error("Failed to remove /run/nologin file: %m");
@@ -50,7 +49,6 @@ int main(int argc, char*argv[]) {
                 }
 
                 if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
-
                         /* If the file doesn't exist and /etc simply
                          * was read-only (in which case unlink()
                          * returns EROFS even if the file doesn't
@@ -58,27 +56,26 @@ int main(int argc, char*argv[]) {
 
                         if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) {
                                 log_error("Failed to remove /etc/nologin file: %m");
-                                q = -errno;
+                                return EXIT_FAILURE;
                         }
                 }
 
-                if (r < 0 || q < 0)
-                        goto finish;
+                if (r < 0)
+                        return EXIT_FAILURE;
 
         } else if (streq(argv[1], "stop")) {
                 int r;
 
                 r = write_string_file_atomic("/run/nologin", "System is going down.");
-                if (r < 0)
+                if (r < 0) {
                         log_error("Failed to create /run/nologin: %s", strerror(-r));
+                        return EXIT_FAILURE;
+                }
 
         } else {
                 log_error("Unknown verb %s.", argv[1]);
-                goto finish;
+                return EXIT_FAILURE;
         }
 
-        ret = EXIT_SUCCESS;
-
-finish:
-        return ret;
+        return EXIT_SUCCESS;
 }