diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-05-30 13:09:03 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
commit | 75c9c5614f87ac2aee5633759e178b12e149209d (patch) | |
tree | fbf67cd4fe03b9524b1d96322d6ab27b4c610467 /src/libelogind/sd-bus | |
parent | d88be29380c987f130a7abaa007e998f0e5c8413 (diff) |
tree-wide: make use of memory_startswith() at various places
Diffstat (limited to 'src/libelogind/sd-bus')
-rw-r--r-- | src/libelogind/sd-bus/bus-socket.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libelogind/sd-bus/bus-socket.c b/src/libelogind/sd-bus/bus-socket.c index 04839bada..57c539142 100644 --- a/src/libelogind/sd-bus/bus-socket.c +++ b/src/libelogind/sd-bus/bus-socket.c @@ -248,16 +248,13 @@ static bool line_equals(const char *s, size_t m, const char *line) { } static bool line_begins(const char *s, size_t m, const char *word) { - size_t l; - - l = strlen(word); - if (m < l) - return false; + const char *p; - if (memcmp(s, word, l) != 0) + p = memory_startswith(s, m, word); + if (!p) return false; - return m == l || (m > l && s[l] == ' '); + return IN_SET(*p, 0, ' '); } static int verify_anonymous_token(sd_bus *b, const char *p, size_t l) { |