picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core/manager: make manager_load_unit*() functions always take output arg 

We were inconsistent, manager_load_unit_prepare() would crash if _ret was ever NULL.
But none of the callers use NULL. So simplify things and require it to be non-NULL.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-12 12:40:09 -05:00
parent 6818c54ca6
commit 7a6a095a9e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/manager.c
View File

@ -1481,6 +1481,7 @@ int manager_load_unit_prepare(
assert(m);
assert(name || path);
assert(_ret);
/* This will prepare the unit for loading, but not actually
* load anything from disk. */
@ -1528,8 +1529,7 @@ int manager_load_unit_prepare(
unit_add_to_dbus_queue(ret);
unit_add_to_gc_queue(ret);
if (_ret)
*_ret = ret;
*_ret = ret;
return 0;
}
@ -1544,6 +1544,7 @@ int manager_load_unit(
int r;
assert(m);
assert(_ret);
/* This will load the service information files, but not actually
* start any services or anything. */
@ -1554,8 +1555,7 @@ int manager_load_unit(
manager_dispatch_load_queue(m);
if (_ret)
*_ret = unit_follow_merge(*_ret);
*_ret = unit_follow_merge(*_ret);
return 0;
}