shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 16:21:26 +03:00
Code

sd-device: make sd_device_get_xxx() accept NULL for storing result

Browse Source 
Though, setting NULL for some getters, e.g. sd_device_get_syspath()
may be meaningless, but anyway also let's make them accept NULL for
consistency.
This commit is contained in:
Yu Watanabe 2021-02-19 00:28:16 +09:00
parent 163e0a882c
commit 45e093a968
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/libsystemd/sd-device/sd-device.c
View File

@ -519,7 +519,7 @@ int device_read_uevent_file(sd_device *device) {
return 0; return 0;
} }
if (r == -ENOENT) if (r == -ENOENT)
/* some devices may not have uevent files, see set_syspath() */ /* some devices may not have uevent files, see device_set_syspath() */
return 0; return 0;
if (r < 0) if (r < 0)
return log_device_debug_errno(device, r, "sd-device: Failed to read uevent file '%s': %m", path); return log_device_debug_errno(device, r, "sd-device: Failed to read uevent file '%s': %m", path);
@ -674,11 +674,11 @@ _public_ int sd_device_new_from_device_id(sd_device **ret, const char *id) {
_public_ int sd_device_get_syspath(sd_device *device, const char **ret) { _public_ int sd_device_get_syspath(sd_device *device, const char **ret) {
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(ret, -EINVAL);
assert(path_startswith(device->syspath, "/sys/")); assert(path_startswith(device->syspath, "/sys/"));
*ret = device->syspath; if (ret)
*ret = device->syspath;
return 0; return 0;
} }
@ -720,8 +720,6 @@ static int device_new_from_child(sd_device **ret, sd_device *child) {
} }
_public_ int sd_device_get_parent(sd_device *child, sd_device **ret) { _public_ int sd_device_get_parent(sd_device *child, sd_device **ret) {
assert_return(ret, -EINVAL);
assert_return(child, -EINVAL); assert_return(child, -EINVAL);
if (!child->parent_set) { if (!child->parent_set) {
@ -733,7 +731,8 @@ _public_ int sd_device_get_parent(sd_device *child, sd_device **ret) {
if (!child->parent) if (!child->parent)
return -ENOENT; return -ENOENT;
*ret = child->parent; if (ret)
*ret = child->parent;
return 0; return 0;
} }
@ -779,7 +778,6 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
const char *syspath, *drivers = NULL; const char *syspath, *drivers = NULL;
int r; int r;
assert_return(ret, -EINVAL);
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
r = sd_device_get_syspath(device, &syspath); r = sd_device_get_syspath(device, &syspath);
@ -836,7 +834,8 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
if (!device->subsystem) if (!device->subsystem)
return -ENOENT; return -ENOENT;
*ret = device->subsystem; if (ret)
*ret = device->subsystem;
return 0; return 0;
} }
@ -868,10 +867,11 @@ _public_ int sd_device_get_parent_with_subsystem_devtype(sd_device *child, const
r = sd_device_get_parent(child, &parent); r = sd_device_get_parent(child, &parent);
while (r >= 0) { while (r >= 0) {
const char *parent_subsystem = NULL; const char *parent_subsystem = NULL;
const char *parent_devtype = NULL;
(void) sd_device_get_subsystem(parent, &parent_subsystem); (void) sd_device_get_subsystem(parent, &parent_subsystem);
if (streq_ptr(parent_subsystem, subsystem)) { if (streq_ptr(parent_subsystem, subsystem)) {
const char *parent_devtype = NULL;
if (!devtype) if (!devtype)
break; break;
@ -885,7 +885,8 @@ _public_ int sd_device_get_parent_with_subsystem_devtype(sd_device *child, const
if (r < 0) if (r < 0)
return r; return r;
*ret = parent; if (ret)
*ret = parent;
return 0; return 0;
} }
@ -928,7 +929,6 @@ int device_set_driver(sd_device *device, const char *_driver) {
_public_ int sd_device_get_driver(sd_device *device, const char **ret) { _public_ int sd_device_get_driver(sd_device *device, const char **ret) {
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(ret, -EINVAL);
if (!device->driver_set) { if (!device->driver_set) {
_cleanup_free_ char *driver = NULL; _cleanup_free_ char *driver = NULL;
@ -955,18 +955,19 @@ _public_ int sd_device_get_driver(sd_device *device, const char **ret) {
if (!device->driver) if (!device->driver)
return -ENOENT; return -ENOENT;
*ret = device->driver; if (ret)
*ret = device->driver;
return 0; return 0;
} }
_public_ int sd_device_get_devpath(sd_device *device, const char **devpath) { _public_ int sd_device_get_devpath(sd_device *device, const char **devpath) {
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(devpath, -EINVAL);
assert(device->devpath); assert(device->devpath);
assert(device->devpath[0] == '/'); assert(device->devpath[0] == '/');
*devpath = device->devpath; if (devpath)
*devpath = device->devpath;
return 0; return 0;
} }
@ -974,7 +975,6 @@ _public_ int sd_device_get_devname(sd_device *device, const char **devname) {
int r; int r;
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(devname, -EINVAL);
r = device_read_uevent_file(device); r = device_read_uevent_file(device);
if (r < 0) if (r < 0)
@ -985,7 +985,8 @@ _public_ int sd_device_get_devname(sd_device *device, const char **devname) {
assert(path_startswith(device->devname, "/dev/")); assert(path_startswith(device->devname, "/dev/"));
*devname = device->devname; if (devname)
*devname = device->devname;
return 0; return 0;
} }
@ -1035,7 +1036,6 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) {
int r; int r;
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(ret, -EINVAL);
if (!device->sysname_set) { if (!device->sysname_set) {
r = device_set_sysname(device); r = device_set_sysname(device);
@ -1045,7 +1045,8 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) {
assert_return(device->sysname, -ENOENT); assert_return(device->sysname, -ENOENT);
*ret = device->sysname; if (ret)
*ret = device->sysname;
return 0; return 0;
} }
@ -1053,7 +1054,6 @@ _public_ int sd_device_get_sysnum(sd_device *device, const char **ret) {
int r; int r;
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(ret, -EINVAL);
if (!device->sysname_set) { if (!device->sysname_set) {
r = device_set_sysname(device); r = device_set_sysname(device);
@ -1064,7 +1064,8 @@ _public_ int sd_device_get_sysnum(sd_device *device, const char **ret) {
if (!device->sysnum) if (!device->sysnum)
return -ENOENT; return -ENOENT;
*ret = device->sysnum; if (ret)
*ret = device->sysnum;
return 0; return 0;
} }
@ -1434,7 +1435,6 @@ _public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *u
int r; int r;
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
assert_return(usec, -EINVAL);
r = device_read_db(device); r = device_read_db(device);
if (r < 0) if (r < 0)
@ -1451,7 +1451,8 @@ _public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *u
if (now_ts < device->usec_initialized) if (now_ts < device->usec_initialized)
return -EIO; return -EIO;
*usec = now_ts - device->usec_initialized; if (usec)
*usec = now_ts - device->usec_initialized;
return 0; return 0;
} }
@ -1799,8 +1800,8 @@ _public_ int sd_device_has_current_tag(sd_device *device, const char *tag) {
return set_contains(device->current_tags, tag); return set_contains(device->current_tags, tag);
} }
_public_ int sd_device_get_property_value(sd_device *device, const char *key, const char **_value) { _public_ int sd_device_get_property_value(sd_device *device, const char *key, const char **ret_value) {
char *value; const char *value;
int r; int r;
assert_return(device, -EINVAL); assert_return(device, -EINVAL);
@ -1814,8 +1815,8 @@ _public_ int sd_device_get_property_value(sd_device *device, const char *key, co
if (!value) if (!value)
return -ENOENT; return -ENOENT;
if (_value) if (ret_value)
*_value = value; *ret_value = value;
return 0; return 0;
} }