X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbytestring%2Fbytestring.h;h=bc99e7951c739e94221148e12491ea994642fbae;hb=440efa555b08324386fa15488cefaed68a791d6e;hp=8aa272755caa90b2ad1c18655a8195093d7ec7cf;hpb=cb2d540f764b225a068a3cdd1396df4fc8dc6824;p=ccan

diff --git a/ccan/bytestring/bytestring.h b/ccan/bytestring/bytestring.h
index 8aa27275..bc99e795 100644
--- a/ccan/bytestring/bytestring.h
+++ b/ccan/bytestring/bytestring.h
@@ -11,6 +11,7 @@
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
+#include <ccan/compiler/compiler.h>
 
 struct bytestring {
 	const char *ptr;
@@ -29,7 +30,8 @@ struct bytestring {
  *	struct bytestring bs = bytestring(x, 5);
  *	assert(bs.len == 5);
  */
-static inline struct bytestring bytestring(const char *p, size_t l)
+static inline CONST_FUNCTION struct bytestring
+bytestring(const char *p, size_t l)
 {
 	struct bytestring bs = {
 		.ptr = p,
@@ -53,6 +55,18 @@ static inline struct bytestring bytestring(const char *p, size_t l)
  */
 #define BYTESTRING(s) (bytestring((s), ARRAY_SIZE(s) - 1))
 
+/**
+ * BYTESTRING_INIT - bytestring initializer
+ * @s: string literal
+ *
+ * Produces an initializer for a bytestring from a literal string.
+ * The resulting bytestring will not include the terminating \0, but
+ * will include any internal \0s.
+ *
+ * Example:
+ *	static const struct bytestring CONSTANT = BYTESTRING_INIT("CONSTANT");
+ */
+#define BYTESTRING_INIT(s) { .ptr = (s), .len = ARRAY_SIZE(s) - 1}
 
 /**
  * bytestring_from_string - construct a bytestring from a NUL terminated string
@@ -80,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);
 }
 
 /**
@@ -135,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);
 }
 
 /**
@@ -149,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);
 }
 
 /**
@@ -246,4 +257,62 @@ struct bytestring bytestring_splitchr_next(struct bytestring whole,
 	     (_s).ptr;					       \
 	     (_s) = bytestring_splitchr_next((_w), (_delim), (_s)))
 
+/**
+ * bytestring_splitchrs_first - split a bytestring on a set of delimiter
+ *                              characters
+ * @whole: a bytestring
+ * @delim: delimiter characters
+ *
+ * Returns the first substring of @whole delimited by any character in
+ * @delim.
+ */
+struct bytestring bytestring_splitchrs_first(struct bytestring whole,
+					     struct bytestring delim);
+
+/**
+ * bytestring_splitchr_next - split a bytestring on a set of delimiter
+ *                            characters
+ * @whole: a bytestring
+ * @delim: delimiter character
+ * @prev: last substring
+ *
+ * Returns the next @delim delimited substring of @whole after @prev.
+ */
+struct bytestring bytestring_splitchrs_next(struct bytestring whole,
+					    struct bytestring delim,
+					    struct bytestring prev);
+
+#define bytestring_foreach_splitchrs(_s, _w, _delim) \
+	for ((_s) = bytestring_splitchrs_first((_w), (_delim)); \
+	     (_s).ptr;					       \
+	     (_s) = bytestring_splitchrs_next((_w), (_delim), (_s)))
+
+/**
+ * bytestring_splitstr_first - split a bytestring on a delimiter string
+ * @whole: a bytestring
+ * @delim: delimiter substring
+ *
+ * Returns the first substring of @whole delimited by the substring in
+ * @delim.
+ */
+struct bytestring bytestring_splitstr_first(struct bytestring whole,
+					     struct bytestring delim);
+
+/**
+ * bytestring_splitstr_next - split a bytestring on a delimiter string
+ * @whole: a bytestring
+ * @delim: delimiter string
+ * @prev: last substring
+ *
+ * Returns the next @delim delimited substring of @whole after @prev.
+ */
+struct bytestring bytestring_splitstr_next(struct bytestring whole,
+					   struct bytestring delim,
+					   struct bytestring prev);
+
+#define bytestring_foreach_splitstr(_s, _w, _delim) \
+	for ((_s) = bytestring_splitstr_first((_w), (_delim)); \
+	     (_s).ptr;					       \
+	     (_s) = bytestring_splitstr_next((_w), (_delim), (_s)))
+
 #endif /* CCAN_BYTESTRING_H_ */