From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 17 Apr 2024 13:50:22 +0000 (+0800)
Subject: journal-gatewayd: use skip_leading_chars where appropriate
X-Git-Tag: v256-rc1~152^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee0373cb8076d365e4370a4d10f56c4fc1756854;p=thirdparty%2Fsystemd.git

journal-gatewayd: use skip_leading_chars where appropriate

Prompted by c5d675472588815dedf67af8c36da0fac398fb3e
---

diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 055ab66668b..ff5efbcf557 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -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;
 
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 036283fcd2d..dd91f229230 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -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;
 }