system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 20:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21870 from keszybz/cleanup-and-comments

Browse source 
Use _cleanup_ and adjust comments
This commit is contained in:
Luca Boccassi 2021-12-23 17:43:37 +00:00 committed by GitHub
parent 8d48a86c1d 90c8234e0c
commit a5016a0ace
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/basic/static-destruct.h
View file

@ -24,15 +24,15 @@ typedef struct StaticDestructor {
typeof(variable) *q = p; \
func(q); \
} \
/* Older compilers don't know retain attribute. */ \
/* Older compilers don't know "retain" attribute. */ \
_Pragma("GCC diagnostic ignored \"-Wattributes\"") \
/* The actual destructor structure we place in a special section to find it */ \
/* The actual destructor structure we place in a special section to find it. */ \
_section_("SYSTEMD_STATIC_DESTRUCT") \
/* We pick pointer alignment, since that is apparently what gcc does for static variables */ \
/* Use pointer alignment, since that is apparently what gcc does for static variables. */ \
_alignptr_ \
/* Make sure this is not dropped from the image because not explicitly referenced */ \
/* Make sure this is not dropped from the image despite not being explicitly referenced. */ \
_used_ \
/* Prevent linker from garbage collection. */ \
/* Prevent garbage collection by the linker. */ \
_retain_ \
/* Make sure that AddressSanitizer doesn't pad this variable: we want everything in this section
* packed next to each other so that we can enumerate it. */ \

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;
}

6
src/shared/tmpfile-util-label.h
View file

@ -3,8 +3,8 @@
#include <stdio.h>
/* These functions are split out of tmpfile-util.h (and not for example just flags to the functions they wrap) in order
* to optimize linking: This way, -lselinux is needed only for the callers of these functions that need selinux, but
* not for all */
/* These functions are split out of tmpfile-util.h (and not for example just flags to the functions they
* wrap) in order to optimize linking: this way, -lselinux is needed only for the callers of these functions
* that need selinux, but not for all. */
int fopen_temporary_label(const char *target, const char *path, FILE **f, char **temp_path);