shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

hostnamed: use strdup_to_full()

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-03-15 13:20:15 +01:00
parent 892c5902ae
commit d3a3d2d328
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/hostname/hostnamed.c
View File

@ -211,7 +211,6 @@ static bool use_dmi_data(void) {
static int get_dmi_data(const char *database_key, const char *regular_key, char **ret) {
_cleanup_(sd_device_unrefp) sd_device *device = NULL;
_cleanup_free_ char *b = NULL;
const char *s = NULL;
int r;
@ -227,17 +226,7 @@ static int get_dmi_data(const char *database_key, const char *regular_key, char
if (!s && regular_key)
(void) sd_device_get_property_value(device, regular_key, &s);
if (!ret)
return !!s;
if (s) {
b = strdup(s);
if (!b)
return -ENOMEM;
}
*ret = TAKE_PTR(b);
return !!s;
return strdup_to_full(ret, s);
}
static int get_hardware_vendor(char **ret) {
@ -264,23 +253,7 @@ static int get_hardware_firmware_data(const char *sysattr, char **ret) {
(void) sd_device_get_sysattr_value(device, sysattr, &s);
bool empty = isempty(s);
if (ret) {
if (empty)
*ret = NULL;
else {
_cleanup_free_ char *b = NULL;
b = strdup(s);
if (!b)
return -ENOMEM;
*ret = TAKE_PTR(b);
}
}
return !empty;
return strdup_to_full(ret, empty_to_null(s));
}
static int get_hardware_serial(char **ret) {