SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-util: minor cleanups

Browse Source 
Reuse unlink_and_free() and avoid unnecessary
call to rmdir()
This commit is contained in:
Mike Yuan
2023-03-13 00:40:15 +08:00
parent 7d28e496e8
commit 8992667fef
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/edit-util.c
+3 -7
View File
@@ -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);