chiark / gitweb /
sd-rtnl: don't assign to unused variable
[elogind.git] / src / journal-remote / journal-upload.c
index 5a30a29427189f405c6d3e15bcc090a729a0d542..40c380aa9ee2277330cac8e9a081b84ab56da9e1 100644 (file)
@@ -324,7 +324,7 @@ static int dispatch_fd_input(sd_event_source *event,
 }
 
 static int open_file_for_upload(Uploader *u, const char *filename) {
-        int fd, r;
+        int fd, r = 0;
 
         if (streq(filename, "-"))
                 fd = STDIN_FILENO;
@@ -748,7 +748,7 @@ int main(int argc, char **argv) {
         log_parse_environment();
 
         r = parse_config();
-        if (r <= 0)
+        if (r < 0)
                 goto finish;
 
         r = parse_argv(argc, argv);
@@ -818,7 +818,10 @@ int main(int argc, char **argv) {
         }
 
 cleanup:
-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down...");
+
         destroy_uploader(&u);
 
 finish: