mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
manager: let manager_free() handle NULLs
This makes the calling code a bit simpler.
This commit is contained in:
parent
f44b9efcec
commit
06d8d842e9
@ -1799,10 +1799,7 @@ int main(int argc, char *argv[]) {
|
||||
finish:
|
||||
pager_close();
|
||||
|
||||
if (m) {
|
||||
manager_free(m);
|
||||
m = NULL;
|
||||
}
|
||||
m = manager_free(m);
|
||||
|
||||
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) {
|
||||
free(arg_default_rlimit[j]);
|
||||
|
@ -889,11 +889,12 @@ static void manager_clear_jobs_and_units(Manager *m) {
|
||||
m->n_running_jobs = 0;
|
||||
}
|
||||
|
||||
void manager_free(Manager *m) {
|
||||
Manager* manager_free(Manager *m) {
|
||||
UnitType c;
|
||||
int i;
|
||||
|
||||
assert(m);
|
||||
if (!m)
|
||||
return NULL;
|
||||
|
||||
manager_clear_jobs_and_units(m);
|
||||
|
||||
@ -955,6 +956,7 @@ void manager_free(Manager *m) {
|
||||
hashmap_free(m->units_requiring_mounts_for);
|
||||
|
||||
free(m);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int manager_enumerate(Manager *m) {
|
||||
|
@ -296,7 +296,7 @@ struct Manager {
|
||||
};
|
||||
|
||||
int manager_new(SystemdRunningAs running_as, bool test_run, Manager **m);
|
||||
void manager_free(Manager *m);
|
||||
Manager* manager_free(Manager *m);
|
||||
|
||||
int manager_enumerate(Manager *m);
|
||||
int manager_startup(Manager *m, FILE *serialization, FDSet *fds);
|
||||
|
Loading…
Reference in New Issue
Block a user