From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 11 Mar 2023 14:52:39 +0000 (+0800)
Subject: edit-util: minor cleanups
X-Git-Tag: v254-rc1~1056^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8992667fefe2f06fcf83181ffac8a71d0b5f03eb;p=thirdparty%2Fsystemd.git

edit-util: minor cleanups

Reuse unlink_and_free() and avoid unnecessary
call to rmdir()
---

diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c
index ba1f4128a0d..734c06601ba 100644
--- a/src/shared/edit-util.c
+++ b/src/shared/edit-util.c
@@ -24,10 +24,7 @@ void edit_file_context_done(EditFileContext *context) {
         assert(context);
 
         FOREACH_ARRAY(i, context->files, context->n_files) {
-                if (i->temp) {
-                        (void) unlink(i->temp);
-                        free(i->temp);
-                }
+                unlink_and_free(i->temp);
 
                 if (context->remove_parent) {
                         _cleanup_free_ char *parent = NULL;
@@ -35,9 +32,8 @@ void edit_file_context_done(EditFileContext *context) {
                         r = path_extract_directory(i->path, &parent);
                         if (r < 0)
                                 log_debug_errno(r, "Failed to extract directory from '%s', ignoring: %m", i->path);
-
-                        /* No need to check if the dir is empty, rmdir does nothing if it is not the case. */
-                        (void) rmdir(parent);
+                        else /* No need to check if the dir is empty, rmdir does nothing if it is not the case. */
+                            (void) rmdir(parent);
                 }
 
                 free(i->path);