Rearrange so as not to include Linux headers unless we need to.

[tripe] / admin.c

diff --git a/admin.c b/admin.c
index 4571b6628aed249c2cfaec5698b026f870defaee..c1c2c128aa84b475744be3441fa5d2b64eaf705c 100644 (file)
--- a/admin.c
+++ b/admin.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: admin.c,v 1.6 2001/02/19 19:11:09 mdw Exp $
+ * $Id: admin.c,v 1.8 2003/04/06 10:25:17 mdw Exp $
  *
  * Admin interface for configuration
  *
@@ -29,6 +29,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: admin.c,v $
+ * Revision 1.8  2003/04/06 10:25:17  mdw
+ * Support Linux TUN/TAP device.  Fix some bugs.
+ *
+ * Revision 1.7  2002/01/13 14:57:33  mdw
+ * Track @lbuf@ and @dstr_vputf@ changes in mLib.
+ *
  * Revision 1.6  2001/02/19 19:11:09  mdw
  * Output buffering on admin connections.
  *
@@ -248,7 +254,7 @@ static void a_write(admin *a, const char *fmt, ...)
   va_list ap;
   dstr d = DSTR_INIT;
   va_start(ap, fmt);
-  dstr_vputf(&d, fmt, ap);
+  dstr_vputf(&d, fmt, &ap);
   va_end(ap);
   dosend(a, d.buf, d.len);
   dstr_destroy(&d);
@@ -273,7 +279,7 @@ void a_warn(const char *fmt, ...)
   if (flags & F_INIT)
     dstr_puts(&d, "WARN ");
   va_start(ap, fmt);
-  dstr_vputf(&d, fmt, ap);
+  dstr_vputf(&d, fmt, &ap);
   va_end(ap);
   if (!(flags & F_INIT))
     moan("%s", d.buf);
@@ -797,6 +803,7 @@ static void a_destroy(admin *a)
 /* --- @a_line@ --- *
  *
  * Arguments:  @char *p@ = pointer to the line read
+ *             @size_t len@ = length of the line
  *             @void *vp@ = pointer to my admin block
  *
  * Returns:    ---
@@ -804,7 +811,7 @@ static void a_destroy(admin *a)
  * Use:                Handles a line of input.
  */
 
-static void a_line(char *p, void *vp)
+static void a_line(char *p, size_t len, void *vp)
 {
   admin *a = vp;
   const acmd *c;