From: Lennart Poettering Date: Mon, 10 Dec 2018 17:52:11 +0000 (+0100) Subject: job: update job_free() to follow our usual return-NULL style X-Git-Tag: v240~82^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728ba51e98959dfd9ad9f70cf6526b0a84b529a0;p=thirdparty%2Fsystemd.git job: update job_free() to follow our usual return-NULL style --- diff --git a/src/core/job.c b/src/core/job.c index af5070b8cf9..0f224f2691b 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -89,7 +89,7 @@ void job_unlink(Job *j) { j->timer_event_source = sd_event_source_unref(j->timer_event_source); } -void job_free(Job *j) { +Job* job_free(Job *j) { assert(j); assert(!j->installed); assert(!j->transaction_prev); @@ -102,7 +102,7 @@ void job_free(Job *j) { sd_bus_track_unref(j->bus_track); strv_free(j->deserialized_clients); - free(j); + return mfree(j); } static void job_set_state(Job *j, JobState state) { diff --git a/src/core/job.h b/src/core/job.h index 5f9c14012ff..1f5bce85a47 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -162,7 +162,7 @@ struct Job { Job* job_new(Unit *unit, JobType type); Job* job_new_raw(Unit *unit); void job_unlink(Job *job); -void job_free(Job *job); +Job* job_free(Job *job); Job* job_install(Job *j); int job_install_deserialized(Job *j); void job_uninstall(Job *j);