mem-impl.h is no longer shared code, so remove

diff --git a/lib/mem-impl.h b/lib/mem-impl.h
deleted file mode 100644 (file)
index b3a16bb..0000000
--- a/lib/mem-impl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of DisOrder.
- * Copyright (C) 2004, 2007, 2008 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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
-comment-column:40
-End:
-*/

diff --git a/server/api.c b/server/api.c
index fe9686c19e1f2b09394d273b86841eb39ddc53fa..cbcdf90ad47d9dd99ff3b0e9cb342aa9164b5062 100644 (file)
--- a/server/api.c
+++ b/server/api.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * 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
  *
  * 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


@@ -24,7 +24,6 @@
 
 /* shared implementation of vararg functions */
 #include "log-impl.h"
 
 /* shared implementation of vararg functions */
 #include "log-impl.h"

-#include "mem-impl.h"

 
 void *disorder_malloc(size_t n) {
   return xmalloc(n);
 
 void *disorder_malloc(size_t n) {
   return xmalloc(n);


@@ -60,6 +59,16 @@ int disorder_snprintf(char buffer[], size_t bufsize, const char *fmt, ...) {
   return n;
 }
 
   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
 /*
 Local Variables:
 c-basic-offset:2