bytestring: Split bytestrings by a set of character delimiters

[ccan] / ccan / bytestring / bytestring.h

diff --git a/ccan/bytestring/bytestring.h b/ccan/bytestring/bytestring.h
index 34d81af2038e4bc5ea0c481e19f27ffb6620ae2a..5a8d3cd896fb003704bada0f535d4e11c5354171 100644 (file)
--- a/ccan/bytestring/bytestring.h
+++ b/ccan/bytestring/bytestring.h
@@ -220,4 +220,60 @@ size_t bytestring_spn(struct bytestring s, struct bytestring accept);
  */
 size_t bytestring_cspn(struct bytestring s, struct bytestring reject);
 
+/**
+ * bytestring_splitchr_first - split a bytestring on a single character delimiter
+ * @whole: a bytestring
+ * @delim: delimiter character
+ *
+ * Returns the first @delim delimited substring of @whole.
+ */
+struct bytestring bytestring_splitchr_first(struct bytestring whole,
+                                           char delim);
+
+/**
+ * bytestring_splitchr_next - split a bytestring on a single character delimiter
+ * @whole: a bytestring
+ * @delim: delimiter character
+ * @prev: last substring
+ *
+ * Returns the next @delim delimited substring of @whole after @prev.
+ */
+struct bytestring bytestring_splitchr_next(struct bytestring whole,
+                                          char delim, struct bytestring prev);
+
+#define bytestring_foreach_splitchr(_s, _w, _delim) \
+       for ((_s) = bytestring_splitchr_first((_w), (_delim)); \
+            (_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)))
+
 #endif /* CCAN_BYTESTRING_H_ */