Merge branch 'io'

[ccan] / ccan / rfc822 / rfc822.h

diff --git a/ccan/rfc822/rfc822.h b/ccan/rfc822/rfc822.h
index 19fccea8f35afbb3d36b0b68c420f7e30ef3572c..e770115c5c6a03fb0e700542752e057ead80d76f 100644 (file)
--- a/ccan/rfc822/rfc822.h
+++ b/ccan/rfc822/rfc822.h
@@ -22,6 +22,9 @@ struct rfc822_msg;
  * callback is called with a string describing where the failure
  * occurred, which can be used to log a more useful error message.
  *
+ * Note that tal also has a default function which calls abort() on allocation
+ * failure: see tal_set_backend().
+ *
  * Example:
  *     static void my_handler(const char *str)
  *     {
@@ -53,15 +56,15 @@ static inline bool rfc822_iswsp(char c)
  * inconsistent, and the function will abort.  If the state of the
  * structure is valid it returns it unchanged.
  *
- * Returns the list head if the list is consistent, NULL if not (it
- * can never return NULL if @abortstr is set).
+ * Returns the @msg if the message is consistent, NULL if not (it can
+ * never return NULL if @abortstr is set).
  */
 struct rfc822_msg *rfc822_check(const struct rfc822_msg *msg,
                                const char *abortstr);
 
 /**
  * rfc822_start - start parsing a new rfc822 message
- * @ctx: talloc context to make allocations in
+ * @ctx: tal context to make allocations in (or talloc #ifdef TAL_USE_TALLOC)
  * @p: pointer to a buffer containing the message text
  * @len: length of the message text
  *
@@ -180,11 +183,10 @@ struct bytestring rfc822_header_unfolded_value(struct rfc822_msg *msg,
 bool rfc822_header_is(struct rfc822_msg *msg, struct rfc822_header *hdr,
                      const char *name);
 
+struct rfc822_header *rfc822_first_header_of_name(struct rfc822_msg *msg,
+                                                 const char *name);
 struct rfc822_header *rfc822_next_header_of_name(struct rfc822_msg *msg,
                                                 struct rfc822_header *hdr,
                                                 const char *name);
 
-#define rfc822_first_header_of_name(_msg, _name) \
-       (rfc822_next_header_of_name((_msg), NULL, (_name)))
-
 #endif /* CCAN_RFC822_H_ */