shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00
Code

basic/time-util: modernize parse_time() a bit

Browse Source
This commit is contained in:
Mike Yuan 2024-11-29 19:30:47 +01:00
parent 2cdfe75689
commit 5dfccccce9
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/time-util.c
View File

@ -1137,19 +1137,14 @@ static const char* extract_multiplier(const char *p, usec_t *ret) {
int parse_time(const char *t, usec_t *ret, usec_t default_unit) {
const char *p, *s;
usec_t usec = 0;
bool something = false;
assert(t);
assert(default_unit > 0);
p = t;
p += strspn(p, WHITESPACE);
p = skip_leading_chars(t, /* bad = */ NULL);
s = startswith(p, "infinity");
if (s) {
s += strspn(s, WHITESPACE);
if (*s != 0)
if (!in_charset(s, WHITESPACE))
return -EINVAL;
if (ret)
@ -1157,13 +1152,14 @@ int parse_time(const char *t, usec_t *ret, usec_t default_unit) {
return 0;
}
for (;;) {
usec_t usec = 0;
for (bool something = false;;) {
usec_t multiplier = default_unit, k;
long long l;
char *e;
p += strspn(p, WHITESPACE);
p = skip_leading_chars(p, /* bad = */ NULL);
if (*p == 0) {
if (!something)
return -EINVAL;