diff options
author | Michal Sekletar <msekleta@redhat.com> | 2022-08-09 11:41:04 +0200 |
---|---|---|
committer | Michal Sekletar <msekleta@redhat.com> | 2022-08-23 11:00:20 +0200 |
commit | 4ee8176fe33bbcd0971c4583a0e7d1cc2a64ac06 (patch) | |
tree | ddc472083743f0b5846f20cdc7f6e8d050490b89 | |
parent | 6b5e82408dbaf67bf86f81432be02ae02d30c182 (diff) | |
download | systemd-4ee8176fe33bbcd0971c4583a0e7d1cc2a64ac06.tar.gz |
core/load-fragment: move config_parse_sec_fix_0 to src/shared
-rw-r--r-- | src/core/load-fragment.c | 31 | ||||
-rw-r--r-- | src/core/load-fragment.h | 1 | ||||
-rw-r--r-- | src/shared/conf-parser.c | 1 | ||||
-rw-r--r-- | src/shared/conf-parser.h | 1 |
4 files changed, 2 insertions, 32 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 0a2d4d4035..801e7d6ccc 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2520,37 +2520,6 @@ int config_parse_service_timeout_abort( return 0; } -int config_parse_sec_fix_0( - const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - usec_t *usec = data; - int r; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(usec); - - /* This is pretty much like config_parse_sec(), except that this treats a time of 0 as infinity, for - * compatibility with older versions of systemd where 0 instead of infinity was used as indicator to turn off a - * timeout. */ - - r = parse_sec_fix_0(rvalue, usec); - if (r < 0) - log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse %s= parameter, ignoring: %s", lvalue, rvalue); - - return 0; -} - int config_parse_user_group_compat( const char *unit, const char *filename, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h index 8842d7ddc8..c57a6b2277 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -115,7 +115,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_bus_name); CONFIG_PARSER_PROTOTYPE(config_parse_exec_utmp_mode); CONFIG_PARSER_PROTOTYPE(config_parse_working_directory); CONFIG_PARSER_PROTOTYPE(config_parse_fdname); -CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0); CONFIG_PARSER_PROTOTYPE(config_parse_user_group_compat); CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv_compat); CONFIG_PARSER_PROTOTYPE(config_parse_restrict_namespaces); diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 887ae0dd61..b7ecf9d532 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -1885,3 +1885,4 @@ int config_parse_in_addr_non_null( DEFINE_CONFIG_PARSE(config_parse_percent, parse_percent, "Failed to parse percent value"); DEFINE_CONFIG_PARSE(config_parse_permyriad, parse_permyriad, "Failed to parse permyriad value"); +DEFINE_CONFIG_PARSE_PTR(config_parse_sec_fix_0, parse_sec_fix_0, usec_t, "Failed to parse time value"); diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 32f2498b53..6d9d243492 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -209,6 +209,7 @@ CONFIG_PARSER_PROTOTYPE(config_parse_in_addr_non_null); CONFIG_PARSER_PROTOTYPE(config_parse_percent); CONFIG_PARSER_PROTOTYPE(config_parse_permyriad); CONFIG_PARSER_PROTOTYPE(config_parse_pid); +CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0); typedef enum Disabled { DISABLED_CONFIGURATION, |