SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: make device_get_properties_{nulstr,strv}() take NULL for result value

Browse Source 
In most cases, it is not necessary to call them without retrieving
result. But, most of other getter functions for sd-device can take NULL.
Let's follow the way for consistency.
This commit is contained in:
Yu Watanabe
2022-07-09 04:14:44 +09:00
parent cff31876da
commit 793ab3e9dd
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-private.c
+8 -8
View File
@@ -559,34 +559,34 @@ static int device_update_properties_bufs(sd_device *device) {
return 0;
}
int device_get_properties_nulstr(sd_device *device, const char **nulstr, size_t *len) {
int device_get_properties_nulstr(sd_device *device, const char **ret_nulstr, size_t *ret_len) {
int r;
assert(device);
assert(nulstr);
assert(len);
r = device_update_properties_bufs(device);
if (r < 0)
return r;
*nulstr = device->properties_nulstr;
*len = device->properties_nulstr_len;
if (ret_nulstr)
*ret_nulstr = device->properties_nulstr;
if (ret_len)
*ret_len = device->properties_nulstr_len;
return 0;
}
int device_get_properties_strv(sd_device *device, char ***strv) {
int device_get_properties_strv(sd_device *device, char ***ret) {
int r;
assert(device);
assert(strv);
r = device_update_properties_bufs(device);
if (r < 0)
return r;
*strv = device->properties_strv;
if (ret)
*ret = device->properties_strv;
return 0;
}
src/libsystemd/sd-device/device-private.h
+2 -2
View File
@@ -48,8 +48,8 @@ uint64_t device_get_tags_generation(sd_device *device);
uint64_t device_get_devlinks_generation(sd_device *device);
int device_properties_prepare(sd_device *device);
int device_get_properties_nulstr(sd_device *device, const char **nulstr, size_t *len);
int device_get_properties_strv(sd_device *device, char ***strv);
int device_get_properties_nulstr(sd_device *device, const char **ret_nulstr, size_t *ret_len);
int device_get_properties_strv(sd_device *device, char ***ret);
int device_rename(sd_device *device, const char *name);
int device_shallow_clone(sd_device *device, sd_device **ret);