X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbytestring%2Fbytestring.h;h=dd1f913ca45ee2f0dbe7d66f50f175256927095b;hb=712dc43d55741bc11490abae8f7edbb8ec982f0d;hp=5a8d3cd896fb003704bada0f535d4e11c5354171;hpb=309577c4747b9a74b6e55d4a9b760ede84b68b4e;p=ccan

diff --git a/ccan/bytestring/bytestring.h b/ccan/bytestring/bytestring.h
index 5a8d3cd8..dd1f913c 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
@@ -276,4 +290,32 @@ struct bytestring bytestring_splitchrs_next(struct bytestring whole,
 	     (_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_ */