util: remove unnecessary NULL check in cleanup_nvme_root()

calebsander · igaw · commit 4e616593b520 · 2024-07-17T17:00:04.000+02:00
cleanup_nvme_root() is checking whether the passed pointer is non-NULL,
but since the pointer is to a local variable, this will always be true.
Therefore, remove the check and always call nvme_free_tree().

Signed-off-by: Caleb Sander Mateos &lt;csander@purestorage.com&gt;
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -38,8 +38,7 @@ static inline void cleanup_fd(int *fd)
 
 static inline void cleanup_nvme_root(nvme_root_t *r)
 {
-	if (r)
-		nvme_free_tree(*r);
+	nvme_free_tree(*r);
 }
 #define _cleanup_nvme_root_ __cleanup__(cleanup_nvme_root)
 

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ static inline void cleanup_fd(int *fd)`
`38`	`38`
`39`	`39`	`static inline void cleanup_nvme_root(nvme_root_t *r)`
`40`	`40`	`{`
`41`		`- if (r)`
`42`		`- nvme_free_tree(*r);`
	`41`	`+ nvme_free_tree(*r);`
`43`	`42`	`}`
`44`	`43`	`#define _cleanup_nvme_root_ __cleanup__(cleanup_nvme_root)`
`45`	`44`