diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 17:59:37 +0100 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 19:18:52 +0100 |
commit | 787a18c467c41d1e5bd8ec05af4afc29df63ea3d (patch) | |
tree | 4c94970e5902190d11d3cceda53ca6693b226a92 /shared/systemd/src/basic/time-util.c | |
parent | 209ff015e26f295bdb7c396962a4e9b4199398fb (diff) | |
parent | 62e6df1f1cd2b3588086dabd38172a30d1253901 (diff) | |
download | NetworkManager-bg/systemd.tar.gz |
systemd: merge branch systemd into masterbg/systemd
Diffstat (limited to 'shared/systemd/src/basic/time-util.c')
-rw-r--r-- | shared/systemd/src/basic/time-util.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/shared/systemd/src/basic/time-util.c b/shared/systemd/src/basic/time-util.c index 4e609a6476..9ea0380aaa 100644 --- a/shared/systemd/src/basic/time-util.c +++ b/shared/systemd/src/basic/time-util.c @@ -1036,6 +1036,15 @@ int parse_sec_fix_0(const char *t, usec_t *ret) { return r; } +int parse_sec_def_infinity(const char *t, usec_t *ret) { + t += strspn(t, WHITESPACE); + if (isempty(t)) { + *ret = USEC_INFINITY; + return 0; + } + return parse_sec(t, ret); +} + static const char* extract_nsec_multiplier(const char *p, nsec_t *multiplier) { static const struct { const char *suffix; |