summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2013-03-06 14:17:59 +0100
committerMichal Schmidt <mschmidt@redhat.com>2013-03-08 10:09:31 +0100
commit5f1be48b264e4d556f688062cc6f4a1e03f9f455 (patch)
treec33437f3ab4a6c06a3a554ba09ae62b92d1c6626 /src/shared
parent0be8342c04bbf129b4a21e5073eacccbbce4e896 (diff)
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().
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/set.c8
-rw-r--r--src/shared/strv.c4
2 files changed, 0 insertions, 12 deletions
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) {
diff --git a/src/shared/strv.c b/src/shared/strv.c
index 60c4762572..117382ed80 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -65,11 +65,7 @@ void strv_free(char **l) {
}
void strv_freep(char ***l) {
- if (!l)
- return;
-
strv_free(*l);
- *l = NULL;
}
char **strv_copy(char **l) {