shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

journal-gatewayd: use skip_leading_chars where appropriate

Browse Source 
Prompted by c5d6754725
This commit is contained in:
Mike Yuan 2024-04-17 21:50:22 +08:00
parent 3d6d879d26
commit ee0373cb80
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/string-util.h
View File

@ -133,7 +133,7 @@ static inline char *truncate_nl(char *s) {
return truncate_nl_full(s, NULL);
}
static inline char *skip_leading_chars(const char *s, const char *bad) {
static inline char* skip_leading_chars(const char *s, const char *bad) {
if (!s)
return NULL;

13
src/journal-remote/journal-gatewayd.c
View File

@ -446,17 +446,14 @@ static int request_parse_range(
return -EINVAL;
m->n_skip = 0;
range_after_eq = startswith(range, "entries=");
if (range_after_eq) {
range_after_eq += strspn(range_after_eq, WHITESPACE);
return request_parse_range_entries(m, range_after_eq);
}
if (range_after_eq)
return request_parse_range_entries(m, skip_leading_chars(range_after_eq, /* bad = */ NULL));
range_after_eq = startswith(range, "realtime=");
if (range_after_eq) {
range_after_eq += strspn(range_after_eq, WHITESPACE);
return request_parse_range_time(m, range_after_eq);
}
if (range_after_eq)
return request_parse_range_time(m, skip_leading_chars(range_after_eq, /* bad = */ NULL));
return 0;
}