summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2024-06-20 16:56:59 +0200
committerGitHub <noreply@github.com>2024-06-20 16:56:59 +0200
commit912730a2d5e3ca4019708bd50fbd871565c63ff9 (patch)
tree6a21b1a2498f7c7d530a8aa0fa39474d311ea806
parentlogind: implement maintenance time (diff)
parentconf-parser: print why config_parse_iec_uint64() fails (diff)
downloadsystemd-912730a2d5e3ca4019708bd50fbd871565c63ff9.tar.xz
systemd-912730a2d5e3ca4019708bd50fbd871565c63ff9.zip
Merge pull request #33426 from aafeijoo-suse/conf-parser-parse-size-log
conf-parser: print why config_parse_iec_uint64() fails
-rw-r--r--src/shared/conf-parser.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index d0b7d01842..5a5a3c7613 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -172,7 +172,7 @@ static int next_assignment(
/* Parse a single logical line */
static int parse_line(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *sections,
@@ -869,7 +869,7 @@ DEFINE_PARSER(mode, mode_t, parse_mode);
DEFINE_PARSER(pid, pid_t, parse_pid);
int config_parse_iec_size(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -901,7 +901,7 @@ int config_parse_iec_size(
}
int config_parse_si_uint64(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -927,7 +927,7 @@ int config_parse_si_uint64(
}
int config_parse_iec_uint64(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -947,13 +947,13 @@ int config_parse_iec_uint64(
r = parse_size(rvalue, 1024, bytes);
if (r < 0)
- log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse size value '%s', ignoring: %m", rvalue);
return 0;
}
int config_parse_iec_uint64_infinity(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -977,7 +977,7 @@ int config_parse_iec_uint64_infinity(
}
int config_parse_bool(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -1037,7 +1037,7 @@ int config_parse_id128(
}
int config_parse_tristate(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -1637,7 +1637,7 @@ int config_parse_rlimit(
}
int config_parse_permille(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -1668,7 +1668,7 @@ int config_parse_permille(
}
int config_parse_vlanprotocol(
- const char* unit,
+ const char *unit,
const char *filename,
unsigned line,
const char *section,