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

sd-device: rename argument names for storing result

Browse Source 
When a function takes only one argument for storing result, the argument
is not necessary to be named as ret_xyz, but ret should be enough.
This commit is contained in:
Yu Watanabe
2026-05-18 02:55:56 +09:00
parent 06d687ffac
commit 532276524f
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-private.h
+6 -6
View File
@@ -17,13 +17,13 @@ int device_get_property_int(sd_device *device, const char *key, int *ret);
int device_get_property_uint(sd_device *device, const char *key, unsigned *ret);
int device_get_ifname(sd_device *device, const char **ret);
int device_get_sysattr_safe_string(sd_device *device, const char *sysattr, const char **ret);
int device_get_sysattr_int(sd_device *device, const char *sysattr, int *ret_value);
int device_get_sysattr_unsigned_full(sd_device *device, const char *sysattr, unsigned base, unsigned *ret_value);
static inline int device_get_sysattr_unsigned(sd_device *device, const char *sysattr, unsigned *ret_value) {
return device_get_sysattr_unsigned_full(device, sysattr, 0, ret_value);
int device_get_sysattr_int(sd_device *device, const char *sysattr, int *ret);
int device_get_sysattr_unsigned_full(sd_device *device, const char *sysattr, unsigned base, unsigned *ret);
static inline int device_get_sysattr_unsigned(sd_device *device, const char *sysattr, unsigned *ret) {
return device_get_sysattr_unsigned_full(device, sysattr, 0, ret);
}
int device_get_sysattr_u32(sd_device *device, const char *sysattr, uint32_t *ret_value);
int device_get_sysattr_u64(sd_device *device, const char *sysattr, uint64_t *ret_value);
int device_get_sysattr_u32(sd_device *device, const char *sysattr, uint32_t *ret);
int device_get_sysattr_u64(sd_device *device, const char *sysattr, uint64_t *ret);
int device_get_sysattr_bool(sd_device *device, const char *sysattr);
int device_get_devlink_priority(sd_device *device, int *ret);
int device_get_devnode_mode(sd_device *device, mode_t *ret);
src/libsystemd/sd-device/sd-device.c
+23 -23
View File
@@ -888,7 +888,7 @@ int device_read_uevent_file(sd_device *device) {
return 0;
}
_public_ int sd_device_get_ifindex(sd_device *device, int *ifindex) {
_public_ int sd_device_get_ifindex(sd_device *device, int *ret) {
int r;
assert_return(device, -EINVAL);
@@ -900,8 +900,8 @@ _public_ int sd_device_get_ifindex(sd_device *device, int *ifindex) {
if (device->ifindex <= 0)
return -ENOENT;
if (ifindex)
*ifindex = device->ifindex;
if (ret)
*ret = device->ifindex;
return 0;
}
@@ -1348,7 +1348,7 @@ _public_ int sd_device_get_parent_with_subsystem_devtype(sd_device *device, cons
}
}
_public_ int sd_device_get_devnum(sd_device *device, dev_t *devnum) {
_public_ int sd_device_get_devnum(sd_device *device, dev_t *ret) {
int r;
assert_return(device, -EINVAL);
@@ -1360,8 +1360,8 @@ _public_ int sd_device_get_devnum(sd_device *device, dev_t *devnum) {
if (major(device->devnum) <= 0)
return -ENOENT;
if (devnum)
*devnum = device->devnum;
if (ret)
*ret = device->devnum;
return 0;
}
@@ -2268,7 +2268,7 @@ _public_ int sd_device_has_current_tag(sd_device *device, const char *tag) {
return set_contains(device->current_tags, tag);
}
_public_ int sd_device_get_property_value(sd_device *device, const char *key, const char **ret_value) {
_public_ int sd_device_get_property_value(sd_device *device, const char *key, const char **ret) {
const char *value;
int r;
@@ -2283,8 +2283,8 @@ _public_ int sd_device_get_property_value(sd_device *device, const char *key, co
if (!value)
return -ENOENT;
if (ret_value)
*ret_value = value;
if (ret)
*ret = value;
return 0;
}
@@ -2615,8 +2615,8 @@ cache_result:
return device_get_cached_sysattr_value(device, sysattr, ret_value, ret_size);
}
_public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **ret_value) {
return sd_device_get_sysattr_value_with_size(device, sysattr, ret_value, NULL);
_public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **ret) {
return sd_device_get_sysattr_value_with_size(device, sysattr, ret, NULL);
}
int device_get_sysattr_safe_string(sd_device *device, const char *sysattr, const char **ret) {
@@ -2647,7 +2647,7 @@ int device_get_sysattr_safe_string(sd_device *device, const char *sysattr, const
return 0;
}
int device_get_sysattr_int(sd_device *device, const char *sysattr, int *ret_value) {
int device_get_sysattr_int(sd_device *device, const char *sysattr, int *ret) {
const char *value;
int r;
@@ -2660,13 +2660,13 @@ int device_get_sysattr_int(sd_device *device, const char *sysattr, int *ret_valu
if (r < 0)
return log_device_debug_errno(device, r, "Failed to parse '%s' attribute: %m", sysattr);
if (ret_value)
*ret_value = v;
if (ret)
*ret = v;
/* We return "true" if the value is positive. */
return v > 0;
}
int device_get_sysattr_unsigned_full(sd_device *device, const char *sysattr, unsigned base, unsigned *ret_value) {
int device_get_sysattr_unsigned_full(sd_device *device, const char *sysattr, unsigned base, unsigned *ret) {
const char *value;
int r;
@@ -2679,13 +2679,13 @@ int device_get_sysattr_unsigned_full(sd_device *device, const char *sysattr, uns
if (r < 0)
return log_device_debug_errno(device, r, "Failed to parse '%s' attribute: %m", sysattr);
if (ret_value)
*ret_value = v;
if (ret)
*ret = v;
/* We return "true" if the value is positive. */
return v > 0;
}
int device_get_sysattr_u32(sd_device *device, const char *sysattr, uint32_t *ret_value) {
int device_get_sysattr_u32(sd_device *device, const char *sysattr, uint32_t *ret) {
const char *value;
int r;
@@ -2698,13 +2698,13 @@ int device_get_sysattr_u32(sd_device *device, const char *sysattr, uint32_t *ret
if (r < 0)
return log_device_debug_errno(device, r, "Failed to parse '%s' attribute: %m", sysattr);
if (ret_value)
*ret_value = v;
if (ret)
*ret = v;
/* We return "true" if the value is positive. */
return v > 0;
}
int device_get_sysattr_u64(sd_device *device, const char *sysattr, uint64_t *ret_value) {
int device_get_sysattr_u64(sd_device *device, const char *sysattr, uint64_t *ret) {
const char *value;
int r;
@@ -2717,8 +2717,8 @@ int device_get_sysattr_u64(sd_device *device, const char *sysattr, uint64_t *ret
if (r < 0)
return log_device_debug_errno(device, r, "Failed to parse '%s' attribute: %m", sysattr);
if (ret_value)
*ret_value = v;
if (ret)
*ret = v;
/* We return "true" if the value is positive. */
return v > 0;
}
src/systemd/sd-device.h
+4 -4
View File
@@ -71,8 +71,8 @@ int sd_device_get_syspath(sd_device *device, const char **ret);
int sd_device_get_subsystem(sd_device *device, const char **ret);
int sd_device_get_driver_subsystem(sd_device *device, const char **ret);
int sd_device_get_devtype(sd_device *device, const char **ret);
int sd_device_get_devnum(sd_device *device, dev_t *devnum);
int sd_device_get_ifindex(sd_device *device, int *ifindex);
int sd_device_get_devnum(sd_device *device, dev_t *ret);
int sd_device_get_ifindex(sd_device *device, int *ret);
int sd_device_get_driver(sd_device *device, const char **ret);
int sd_device_get_devpath(sd_device *device, const char **ret);
int sd_device_get_devname(sd_device *device, const char **ret);
@@ -102,10 +102,10 @@ sd_device* sd_device_get_child_next(sd_device *device, const char **ret_suffix);
int sd_device_has_tag(sd_device *device, const char *tag);
int sd_device_has_current_tag(sd_device *device, const char *tag);
int sd_device_get_property_value(sd_device *device, const char *key, const char **value);
int sd_device_get_property_value(sd_device *device, const char *key, const char **ret);
int sd_device_get_trigger_uuid(sd_device *device, sd_id128_t *ret);
int sd_device_get_sysattr_value_with_size(sd_device *device, const char *sysattr, const char **ret_value, size_t *ret_size);
int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **ret_value);
int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **ret);
int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, const char *value);
int sd_device_set_sysattr_valuef(sd_device *device, const char *sysattr, const char *format, ...) _sd_printf_(3, 4);