From 22a03695fda586529bb1bba1206f2286f8658a7d Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Sat, 5 Sep 2015 21:21:04 -0400 Subject: [PATCH] bytestring: use newly added mem helpers Reviwed-by: David Gibson Signed-off-by: Cody P Schafer Signed-off-by: David Gibson --- ccan/bytestring/bytestring.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ccan/bytestring/bytestring.h b/ccan/bytestring/bytestring.h index dd1f913c..bc99e795 100644 --- a/ccan/bytestring/bytestring.h +++ b/ccan/bytestring/bytestring.h @@ -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) { - return (a.len == b.len) - && (memcmp(a.ptr, b.ptr, a.len) == 0); + return memeq(a.ptr, a.len, b.ptr, b.len); } /** @@ -149,8 +148,7 @@ static inline struct bytestring bytestring_slice(struct bytestring s, static inline bool bytestring_starts(struct bytestring s, struct bytestring prefix) { - return (s.len >= prefix.len) && (memcmp(s.ptr, - prefix.ptr, prefix.len) == 0); + return memstarts(s.ptr, s.len, prefix.ptr, prefix.len); } /** @@ -163,8 +161,7 @@ static inline bool bytestring_starts(struct bytestring s, static inline bool bytestring_ends(struct bytestring s, struct bytestring suffix) { - return (s.len >= suffix.len) && (memcmp(s.ptr + s.len - suffix.len, - suffix.ptr, suffix.len) == 0); + return memends(s.ptr, s.len, suffix.ptr, suffix.len); } /** -- 2.39.2