Commit 22a03695 authored by Cody P Schafer's avatar Cody P Schafer Committed by David Gibson

bytestring: use newly added mem helpers

Reviwed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarCody P Schafer <dev@codyps.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 1c9eb9fb
...@@ -94,8 +94,7 @@ static inline struct bytestring bytestring_from_string(const char *s) ...@@ -94,8 +94,7 @@ static inline struct bytestring bytestring_from_string(const char *s)
*/ */
static inline bool bytestring_eq(struct bytestring a, struct bytestring b) static inline bool bytestring_eq(struct bytestring a, struct bytestring b)
{ {
return (a.len == b.len) return memeq(a.ptr, a.len, b.ptr, b.len);
&& (memcmp(a.ptr, b.ptr, a.len) == 0);
} }
/** /**
...@@ -149,8 +148,7 @@ static inline struct bytestring bytestring_slice(struct bytestring s, ...@@ -149,8 +148,7 @@ static inline struct bytestring bytestring_slice(struct bytestring s,
static inline bool bytestring_starts(struct bytestring s, static inline bool bytestring_starts(struct bytestring s,
struct bytestring prefix) struct bytestring prefix)
{ {
return (s.len >= prefix.len) && (memcmp(s.ptr, return memstarts(s.ptr, s.len, prefix.ptr, prefix.len);
prefix.ptr, prefix.len) == 0);
} }
/** /**
...@@ -163,8 +161,7 @@ static inline bool bytestring_starts(struct bytestring s, ...@@ -163,8 +161,7 @@ static inline bool bytestring_starts(struct bytestring s,
static inline bool bytestring_ends(struct bytestring s, static inline bool bytestring_ends(struct bytestring s,
struct bytestring suffix) struct bytestring suffix)
{ {
return (s.len >= suffix.len) && (memcmp(s.ptr + s.len - suffix.len, return memends(s.ptr, s.len, suffix.ptr, suffix.len);
suffix.ptr, suffix.len) == 0);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment