dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

network/address-label: use log_section_warning_errno()

Browse Source
This commit is contained in:
Yu Watanabe
2024-09-01 21:01:40 +09:00
parent 934cf1c06b
commit e208fad798
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/networkd-address-label.c
View File

@@ -296,6 +296,16 @@ int manager_request_static_address_labels(Manager *manager) {
return 0;
}
#define log_label_section(label, fmt, ...) \
({ \
const AddressLabel *_label = (label); \
log_section_warning_errno( \
_label ? _label->section : NULL, \
SYNTHETIC_ERRNO(EINVAL), \
fmt " Ignoring [IPv6AddressLabel] section.", \
##__VA_ARGS__); \
})
static int address_label_section_verify(AddressLabel *label) {
assert(label);
assert(label->section);
@@ -304,16 +314,10 @@ static int address_label_section_verify(AddressLabel *label) {
return -EINVAL;
if (!label->prefix_set)
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: [IPv6AddressLabel] section without Prefix= setting specified. "
"Ignoring [IPv6AddressLabel] section from line %u.",
label->section->filename, label->section->line);
return log_label_section(label, "[IPv6AddressLabel] section without Prefix= setting specified.");
if (label->label == UINT32_MAX)
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: [IPv6AddressLabel] section without Label= setting specified. "
"Ignoring [IPv6AddressLabel] section from line %u.",
label->section->filename, label->section->line);
return log_label_section(label, "[IPv6AddressLabel] section without Label= setting specified.");
return 0;
}