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

sd-netlink: shorten sd_netlink_message_read_string_strdup() a bit

Browse Source
This commit is contained in:
Yu Watanabe
2024-10-11 02:38:16 +09:00
parent ae298c938b
commit 768237e73a
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-netlink/netlink-message.c
+3 -17
View File
@@ -800,30 +800,16 @@ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size
}
int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **ret) {
void *attr_data;
const char *s;
int r;
assert_return(m, -EINVAL);
r = message_attribute_has_type(m, NULL, attr_type, NETLINK_TYPE_STRING);
r = sd_netlink_message_read_string(m, attr_type, &s);
if (r < 0)
return r;
r = netlink_message_read_internal(m, attr_type, &attr_data, NULL);
if (r < 0)
return r;
if (ret) {
char *str;
str = strndup(attr_data, r);
if (!str)
return -ENOMEM;
*ret = str;
}
return 0;
return strdup_to(ret, s);
}
int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **ret) {