From 5f1be48b264e4d556f688062cc6f4a1e03f9f455 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Wed, 6 Mar 2013 14:17:59 +0100 Subject: shared: remove pointless checks in auto-cleanup functions The argument given to the __attribute__((cleanup)) functions is the address of the variable that's going out of scope. It cannot be NULL. The "if (!s)" check in set_freep() is pointless. Perhaps "if (!*s)" was intented. But that's pointless too, because set_free()/set_free_free() are OK to call with a NULL argument (just like free()). Setting "*s = NULL" is pointless, because the variable that s points to is about to go out of scope. The same holds for strv_freep(). --- src/shared/set.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/shared/set.c') diff --git a/src/shared/set.c b/src/shared/set.c index cd910d70ab..111d53bb36 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -38,11 +38,7 @@ void set_free(Set* s) { } void set_freep(Set **s) { - if (!s) - return; - set_free(*s); - *s = NULL; } void set_free_free(Set *s) { @@ -50,11 +46,7 @@ void set_free_free(Set *s) { } void set_free_freep(Set **s) { - if (!*s) - return; - set_free_free(*s); - *s = NULL; } int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func) { -- cgit v1.2.3-54-g00ecf