From: Lennart Poettering Date: Thu, 14 May 2020 16:43:46 +0000 (+0200) Subject: condition: return (Condition*) NULL from condition_free() X-Git-Tag: v246-rc1~356^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=411e835c5040a68a8732ca474d63c2de9b7af2d0;p=thirdparty%2Fsystemd.git condition: return (Condition*) NULL from condition_free() Follow our usual coding style. --- diff --git a/src/shared/condition.c b/src/shared/condition.c index fef37057db9..3c76c86a0fd 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -73,11 +73,11 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger return c; } -void condition_free(Condition *c) { +Condition* condition_free(Condition *c) { assert(c); free(c->parameter); - free(c); + return mfree(c); } Condition* condition_free_list_type(Condition *head, ConditionType type) { diff --git a/src/shared/condition.h b/src/shared/condition.h index fa00f6ea983..11dfc7425b8 100644 --- a/src/shared/condition.h +++ b/src/shared/condition.h @@ -67,7 +67,7 @@ typedef struct Condition { } Condition; Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate); -void condition_free(Condition *c); +Condition* condition_free(Condition *c); Condition* condition_free_list_type(Condition *first, ConditionType type); static inline Condition* condition_free_list(Condition *first) { return condition_free_list_type(first, _CONDITION_TYPE_INVALID);