From 71c404f9cf8b953562a3840421d615e324c61be0 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Mon, 1 Jul 2024 18:59:28 +0200 Subject: [PATCH] shared/mount-util: return early if param is NULL To make things more readable and consistent. --- src/shared/mount-util.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h index 20c63e137fe..c260eef02af 100644 --- a/src/shared/mount-util.h +++ b/src/shared/mount-util.h @@ -83,19 +83,22 @@ int mount_flags_to_string(unsigned long flags, char **ret); /* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */ static inline char* umount_and_rmdir_and_free(char *p) { + if (!p) + return NULL; + PROTECT_ERRNO; - if (p) { - (void) umount_recursive(p, 0); - (void) rmdir(p); - } + (void) umount_recursive(p, 0); + (void) rmdir(p); return mfree(p); } DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_rmdir_and_free); -static inline char *umount_and_free(char *p) { +static inline char* umount_and_free(char *p) { + if (!p) + return NULL; + PROTECT_ERRNO; - if (p) - (void) umount_recursive(p, 0); + (void) umount_recursive(p, 0); return mfree(p); } DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_free); -- 2.47.3