shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-01 05:47:04 +03:00
Code

hostname: use _cleanup_ in one more place

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-12-17 15:22:18 +01:00
parent 8d48a86c1d
commit 68cdeab343
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hostname/hostnamed.c
View File

@ -191,7 +191,7 @@ static bool valid_deployment(const char *deployment) {
static const char* fallback_chassis(void) {
const char *chassis;
char *type;
_cleanup_free_ char *type = NULL;
unsigned t;
int v, r;
@ -210,18 +210,17 @@ static const char* fallback_chassis(void) {
}
r = safe_atou(type, &t);
free(type);
if (r < 0) {
log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m");
log_debug_errno(r, "Failed to parse DMI chassis type \"%s\", ignoring: %m", type);
goto try_acpi;
}
/* We only list the really obvious cases here. The DMI data is unreliable enough, so let's not do any
additional guesswork on top of that.
See the SMBIOS Specification 3.0 section 7.4.1 for details about the values listed here:
https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.0.0.pdf
* additional guesswork on top of that.
*
* See the SMBIOS Specification 3.0 section 7.4.1 for details about the values listed here:
*
* https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.0.0.pdf
*/
switch (t) {
@ -259,6 +258,7 @@ static const char* fallback_chassis(void) {
}
try_acpi:
type = mfree(type);
r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type);
if (r < 0) {
log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m");
@ -266,9 +266,8 @@ try_acpi:
}
r = safe_atou(type, &t);
free(type);
if (r < 0) {
log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m");
log_debug_errno(r, "Failed parse ACPI PM profile \"%s\", ignoring: %m", type);
goto try_devicetree;
}
@ -302,6 +301,7 @@ try_acpi:
}
try_devicetree:
type = mfree(type);
r = read_one_line_file("/proc/device-tree/chassis-type", &type);
if (r < 0) {
log_debug_errno(r, "Failed to read device-tree chassis type, ignoring: %m");
@ -314,10 +314,7 @@ try_devicetree:
* https://github.com/devicetree-org/devicetree-specification/blob/master/source/chapter3-devicenodes.rst */
chassis = valid_chassis(type);
if (!chassis)
log_debug("Invalid device-tree chassis type '%s', ignoring.", type);
free(type);
log_debug("Invalid device-tree chassis type \"%s\", ignoring.", type);
return chassis;
}