From 229b008635a09839cbd5930fe6431397f144b3cb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 30 Nov 2022 15:18:15 +0100 Subject: [PATCH] mountpoint-util: reduce variable scope --- src/basic/mountpoint-util.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c index dc682688a7..c9253b03f2 100644 --- a/src/basic/mountpoint-util.c +++ b/src/basic/mountpoint-util.c @@ -37,7 +37,6 @@ int name_to_handle_at_loop( int *ret_mnt_id, int flags) { - _cleanup_free_ struct file_handle *h = NULL; size_t n = ORIGINAL_MAX_HANDLE_SZ; assert((flags & ~(AT_SYMLINK_FOLLOW|AT_EMPTY_PATH)) == 0); @@ -50,6 +49,7 @@ int name_to_handle_at_loop( * as NULL if there's no interest in either. */ for (;;) { + _cleanup_free_ struct file_handle *h = NULL; int mnt_id = -1; h = malloc0(offsetof(struct file_handle, f_handle) + n); @@ -91,8 +91,6 @@ int name_to_handle_at_loop( n = h->handle_bytes; if (offsetof(struct file_handle, f_handle) + n < n) /* check for addition overflow */ return -EOVERFLOW; - - h = mfree(h); } }