journal-upload: use _cleanup_ attribute to clear uploader
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 25 Nov 2018 20:24:55 +0000 (05:24 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 8 Dec 2018 09:09:40 +0000 (18:09 +0900)
src/journal-remote/journal-upload.c

index 7f08809..fd282ca 100644 (file)
@@ -762,7 +762,7 @@ static int open_journal(sd_journal **j) {
 }
 
 int main(int argc, char **argv) {
-        Uploader u;
+        _cleanup_(destroy_uploader) Uploader u = {};
         int r;
         bool use_journal;
 
@@ -853,8 +853,6 @@ cleanup:
                   "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
-        destroy_uploader(&u);
-
 finish:
         return r >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }