tree-wide: (void)ify a few unlink() and rmdir()

Let's be helpful to static analyzers which care about whether we
knowingly ignore return values. We do in these cases, since they are
usually part of error paths.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 28a1a903d128fea13995381d135126de12439798..dfd68053980e3fbfa304cbe854ad26098023cd07 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -412,7 +412,7 @@ static int run(int argc, char *argv[]) {
                 const char *value;
 
                 if (validate_device(device) == 0) {
-                        unlink(saved);
+                        (void) unlink(saved);
                         return 0;
                 }
 

diff --git a/src/core/namespace.c b/src/core/namespace.c
index dfa3c160c1cd119fc7028c355cba6b67cbd893ab..8475145f068b6ca3337cf741b5d5e9b0678436ea 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1674,8 +1674,8 @@ int setup_tmp_dirs(const char *id, char **tmp_dir, char **var_tmp_dir) {
                 char *t;
 
                 t = strjoina(a, "/tmp");
-                rmdir(t);
-                rmdir(a);
+                (void) rmdir(t);
+                (void) rmdir(a);
 
                 free(a);
                 return r;

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index fbee242962feb699c8360cf09edde25c16e2030e..b239d8194512f8f24187dc4bc58da437e719ea49 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -859,7 +859,7 @@ static int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp)
 
 error:
         if (temp) {
-                unlink(temp);
+                (void) unlink(temp);
                 log_debug("Removed temporary file %s", temp);
         }
         return r;
@@ -985,7 +985,7 @@ finish:
 
         if (unlink_path) {
                 log_debug("Removed temporary file %s", path);
-                unlink(path);
+                (void) unlink(path);
         }
 
         return r;

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 56f3431a08474d2a4bb272b4d578c1a5d951e78f..b90583260357b47aaadc903136acc6b297805bec 100644 (file)
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -183,7 +183,7 @@ static int raw_import_maybe_convert_qcow2(RawImport *i) {
 
         r = qcow2_convert(i->output_fd, converted_fd);
         if (r < 0) {
-                unlink(t);
+                (void) unlink(t);
                 return log_error_errno(r, "Failed to convert qcow2 image: %m");
         }
 

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 72b9054e49c67ec51733cae58371195845a1ec65..691de8b27547e2e022db08dde8c89df36b8427be 100644 (file)
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -250,7 +250,7 @@ static int raw_pull_maybe_convert_qcow2(RawPull *i) {
 
         r = qcow2_convert(i->raw_job->disk_fd, converted_fd);
         if (r < 0) {
-                unlink(t);
+                (void) unlink(t);
                 return log_error_errno(r, "Failed to convert qcow2 image: %m");
         }
 
@@ -364,7 +364,7 @@ static int raw_pull_make_local_copy(RawPull *i) {
 
         r = copy_bytes(i->raw_job->disk_fd, dfd, (uint64_t) -1, COPY_REFLINK);
         if (r < 0) {
-                unlink(tp);
+                (void) unlink(tp);
                 return log_error_errno(r, "Failed to make writable copy of image: %m");
         }
 
@@ -376,7 +376,7 @@ static int raw_pull_make_local_copy(RawPull *i) {
         r = rename(tp, p);
         if (r < 0)  {
                 r = log_error_errno(errno, "Failed to move writable image into place: %m");
-                unlink(tp);
+                (void) unlink(tp);
                 return r;
         }
 

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index ef3556f8254af8468d91bac89812a90517f9de9b..cc968252887104cf185a969d7b0b5da1325c4815 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -106,7 +106,7 @@ static int check_cursor_updating(Uploader *u) {
         if (r < 0)
                 return log_error_errno(r, "Cannot save state to %s: %m",
                                        u->state_file);
-        unlink(temp_path);
+        (void) unlink(temp_path);
 
         return 0;
 }

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 42fb25cc4683e2f9b19538332e71478084ea28b8..00489098eeec948d7d38c0c4e81e759766d6a5c7 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1841,7 +1841,7 @@ finish:
         safe_close(fd);
 
         if (k) {
-                unlink(k);
+                (void) unlink(k);
                 free(k);
         }
 

diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c
index 2ac4b59ad74ca71acbc2b27a961fca316fafbc8e..c83575c7c876c84234c1ba3cff97e29297031e7f 100644 (file)
--- a/src/libsystemd/sd-hwdb/hwdb-util.c
+++ b/src/libsystemd/sd-hwdb/hwdb-util.c
@@ -434,7 +434,7 @@ static int trie_store(struct trie *trie, const char *filename, bool compat) {
  error_fclose:
         r = -errno;
         fclose(t.f);
-        unlink(filename_tmp);
+        (void) unlink(filename_tmp);
         return r;
 }
 

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 1bee58db121cd7c6c1582379d11309b57a742ae2..d427dcaa0128a81af35bed164fab27e96682e3c9 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -59,7 +59,7 @@ void inhibitor_free(Inhibitor *i) {
         free(i->why);
 
         if (i->state_file) {
-                unlink(i->state_file);
+                (void) unlink(i->state_file);
                 free(i->state_file);
         }
 
@@ -173,7 +173,7 @@ int inhibitor_stop(Inhibitor *i) {
                           inhibit_mode_to_string(i->mode));
 
         if (i->state_file)
-                unlink(i->state_file);
+                (void) unlink(i->state_file);
 
         i->started = false;
 
@@ -320,7 +320,7 @@ void inhibitor_remove_fifo(Inhibitor *i) {
         i->fifo_fd = safe_close(i->fifo_fd);
 
         if (i->fifo_path) {
-                unlink(i->fifo_path);
+                (void) unlink(i->fifo_path);
                 i->fifo_path = mfree(i->fifo_path);
         }
 }

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 752fcd56b1dd20a4bc4b8fcd6e06d29af34949ce..3e334c8d29cccce8cbe558e47292acaeec8e22c1 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -4018,7 +4018,7 @@ int link_save(Link *link) {
         assert(link->manager);
 
         if (link->state == LINK_STATE_LINGER) {
-                unlink(link->state_file);
+                (void) unlink(link->state_file);
                 return 0;
         }
 
@@ -4287,7 +4287,7 @@ int link_save(Link *link) {
                         "DHCP_LEASE=%s\n",
                         link->lease_file);
         } else
-                unlink(link->lease_file);
+                (void) unlink(link->lease_file);
 
         if (link->ipv4ll) {
                 struct in_addr address;

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index df28bcfd720df874fcacb4ad18c8e430353e799d..b9fa33485865f60e9743d74342994b2b3804724a 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -244,7 +244,7 @@ static int make_backup(const char *target, const char *x) {
         return 0;
 
 fail:
-        unlink(temp);
+        (void) unlink(temp);
         return r;
 }