mirror of
https://github.com/systemd/systemd
synced 2024-09-30 05:15:19 +00:00
Merge pull request #33426 from aafeijoo-suse/conf-parser-parse-size-log
conf-parser: print why config_parse_iec_uint64() fails
This commit is contained in:
commit
912730a2d5
|
@ -172,7 +172,7 @@ static int next_assignment(
|
||||||
|
|
||||||
/* Parse a single logical line */
|
/* Parse a single logical line */
|
||||||
static int parse_line(
|
static int parse_line(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *sections,
|
const char *sections,
|
||||||
|
@ -869,7 +869,7 @@ DEFINE_PARSER(mode, mode_t, parse_mode);
|
||||||
DEFINE_PARSER(pid, pid_t, parse_pid);
|
DEFINE_PARSER(pid, pid_t, parse_pid);
|
||||||
|
|
||||||
int config_parse_iec_size(
|
int config_parse_iec_size(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -901,7 +901,7 @@ int config_parse_iec_size(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_si_uint64(
|
int config_parse_si_uint64(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -927,7 +927,7 @@ int config_parse_si_uint64(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_iec_uint64(
|
int config_parse_iec_uint64(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -947,13 +947,13 @@ int config_parse_iec_uint64(
|
||||||
|
|
||||||
r = parse_size(rvalue, 1024, bytes);
|
r = parse_size(rvalue, 1024, bytes);
|
||||||
if (r < 0)
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_iec_uint64_infinity(
|
int config_parse_iec_uint64_infinity(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -977,7 +977,7 @@ int config_parse_iec_uint64_infinity(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_bool(
|
int config_parse_bool(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -1037,7 +1037,7 @@ int config_parse_id128(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_tristate(
|
int config_parse_tristate(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -1637,7 +1637,7 @@ int config_parse_rlimit(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_permille(
|
int config_parse_permille(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
@ -1668,7 +1668,7 @@ int config_parse_permille(
|
||||||
}
|
}
|
||||||
|
|
||||||
int config_parse_vlanprotocol(
|
int config_parse_vlanprotocol(
|
||||||
const char* unit,
|
const char *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
const char *section,
|
const char *section,
|
||||||
|
|
Loading…
Reference in a new issue