Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / server / api.c

diff --git a/server/api.c b/server/api.c
index fe9686c19e1f2b09394d273b86841eb39ddc53fa..e973fbe2522cf6ecc13d1e4dd1f843c07bf60d3d 100644 (file)
--- a/server/api.c
+++ b/server/api.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008, 2009 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,6 @@
  */
 #include "disorder-server.h"
 
-/* shared implementation of vararg functions */
-#include "log-impl.h"
-#include "mem-impl.h"
-
 void *disorder_malloc(size_t n) {
   return xmalloc(n);
 }
@@ -60,6 +56,16 @@ int disorder_snprintf(char buffer[], size_t bufsize, const char *fmt, ...) {
   return n;
 }
 
+int disorder_asprintf(char **rp, const char *fmt, ...) {
+  va_list ap;
+  int n;
+
+  va_start(ap, fmt);
+  n = byte_vasprintf(rp, fmt, ap);
+  va_end(ap);
+  return n;
+}
+
 /*
 Local Variables:
 c-basic-offset:2