parent
ba876a4c8d
commit
08f468567d
|
@ -1968,7 +1968,6 @@ int manager_load_unit_prepare(
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert(m);
|
assert(m);
|
||||||
assert(name || path);
|
|
||||||
assert(_ret);
|
assert(_ret);
|
||||||
|
|
||||||
/* This will prepare the unit for loading, but not actually
|
/* This will prepare the unit for loading, but not actually
|
||||||
|
@ -1977,8 +1976,13 @@ int manager_load_unit_prepare(
|
||||||
if (path && !is_path(path))
|
if (path && !is_path(path))
|
||||||
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
|
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
|
||||||
|
|
||||||
if (!name)
|
if (!name) {
|
||||||
|
/* 'name' and 'path' must not both be null. Check here 'path' using assert_se() to
|
||||||
|
* workaround a bug in gcc that generates a -Wnonnull warning when calling basename(),
|
||||||
|
* but this cannot be possible in any code path (See #6119). */
|
||||||
|
assert_se(path);
|
||||||
name = basename(path);
|
name = basename(path);
|
||||||
|
}
|
||||||
|
|
||||||
t = unit_name_to_type(name);
|
t = unit_name_to_type(name);
|
||||||
|
|
||||||
|
|
|
@ -1013,10 +1013,14 @@ static int install_info_add(
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert(c);
|
assert(c);
|
||||||
assert(name || path);
|
|
||||||
|
|
||||||
if (!name)
|
if (!name) {
|
||||||
|
/* 'name' and 'path' must not both be null. Check here 'path' using assert_se() to
|
||||||
|
* workaround a bug in gcc that generates a -Wnonnull warning when calling basename(),
|
||||||
|
* but this cannot be possible in any code path (See #6119). */
|
||||||
|
assert_se(path);
|
||||||
name = basename(path);
|
name = basename(path);
|
||||||
|
}
|
||||||
|
|
||||||
if (!unit_name_is_valid(name, UNIT_NAME_ANY))
|
if (!unit_name_is_valid(name, UNIT_NAME_ANY))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
Loading…
Reference in a new issue