From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 20 Dec 2008 17:06:11 +0000 (+0000)
Subject: server: Make a_vformat public.
X-Git-Tag: 1.0.0pre8~34^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/7f73baaff6c35768a1357c4b102b1aed51fd78d8

server: Make a_vformat public.

We'll need it soon enough.
---

diff --git a/server/admin.c b/server/admin.c
index 00288f30..5509de07 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -238,10 +238,28 @@ static void a_flush(int fd, unsigned mode, void *v)
  *
  * Returns:	---
  *
- * Use:		Main message token formatting driver.
+ * Use:		Main message token formatting driver.  The arguments are
+ *		interleaved formatting tokens and their parameters, finally
+ *		terminated by an entry @A_END@.
+ *
+ *		Tokens recognized:
+ *
+ *		  * "*..." ... -- pretokenized @dstr_putf@-like string
+ *
+ *		  * "?ADDR" SOCKADDR -- a socket address, to be converted
+ *
+ *		  * "?B64" BUFFER SIZE -- binary data to be base64-encoded
+ *
+ *		  * "?TOKENS" VECTOR -- null-terminated vector of tokens
+ *
+ *		  * "?PEER" PEER -- peer's name
+ *
+ *		  * "?ERRNO" ERRNO -- system error code
+ *
+ *		  * "[!]..." ... -- @dstr_putf@-like string as single token
  */
 
-static void a_vformat(dstr *d, const char *fmt, va_list ap)
+void a_vformat(dstr *d, const char *fmt, va_list ap)
 {
   dstr dd = DSTR_INIT;
 
diff --git a/server/tripe.h b/server/tripe.h
index a3f04c73..404bad0f 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -825,6 +825,37 @@ extern int c_check(buf */*b*/);
 
 #define A_END ((char *)0)
 
+/* --- @a_vformat@ --- *
+ *
+ * Arguments:	@dstr *d@ = where to leave the formatted message
+ *		@const char *fmt@ = pointer to format string
+ *		@va_list ap@ = arguments in list
+ *
+ * Returns:	---
+ *
+ * Use:		Main message token formatting driver.  The arguments are
+ *		interleaved formatting tokens and their parameters, finally
+ *		terminated by an entry @A_END@.
+ *
+ *		Tokens recognized:
+ *
+ *		  * "*..." ... -- pretokenized @dstr_putf@-like string
+ *
+ *		  * "?ADDR" SOCKADDR -- a socket address, to be converted
+ *
+ *		  * "?B64" BUFFER SIZE -- binary data to be base64-encoded
+ *
+ *		  * "?TOKENS" VECTOR -- null-terminated vector of tokens
+ *
+ *		  * "?PEER" PEER -- peer's name
+ *
+ *		  * "?ERRNO" ERRNO -- system error code
+ *
+ *		  * "[!]..." ... -- @dstr_putf@-like string as single token
+ */
+
+extern void a_vformat(dstr */*d*/, const char */*fmt*/, va_list /*ap*/);
+
 /* --- @a_warn@ --- *
  *
  * Arguments:	@const char *fmt@ = pointer to format string