X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxmalloc.c;h=58f2bcee3e950e0958d240afe8501de876d64e6d;hp=9563391ec688535f110d919772184b90831b5aec;hb=cfa738d3185980ff8532a35192a9113b0e9a937c;hpb=4c85542894f7fca823b119b05e07179deb24229a

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 9563391e..58f2bcee 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -34,6 +34,7 @@ void *realloc ();
 void free ();
 #endif
 
+#include "dropin.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
@@ -55,7 +56,7 @@ int xalloc_exit_failure = EXIT_FAILURE;
 char *const xalloc_msg_memory_exhausted = "Memory exhausted";
 
 /* FIXME: describe */
-void (*xalloc_fail_func) (int) = 0;
+void (*xalloc_fail_func) (int) = NULL;
 
 static void
 xalloc_fail (int size)
@@ -69,13 +70,12 @@ xalloc_fail (int size)
 /* Allocate N bytes of memory dynamically, with error checking.  */
 
 void *
-xmalloc (n)
-     size_t n;
+xmalloc (size_t n)
 {
   void *p;
 
   p = malloc (n);
-  if (p == 0)
+  if (p == NULL)
     xalloc_fail ((int)n);
   return p;
 }
@@ -83,13 +83,12 @@ xmalloc (n)
 /* Allocate N bytes of memory dynamically, and set it all to zero. */
 
 void *
-xmalloc_and_zero (n)
-     size_t n;
+xmalloc_and_zero (size_t n)
 {
   void *p;
 
   p = malloc (n);
-  if (p == 0)
+  if (p == NULL)
     xalloc_fail ((int)n);
   memset (p, '\0', n);
   return p;
@@ -100,12 +99,10 @@ xmalloc_and_zero (n)
    If P is NULL, run xmalloc.  */
 
 void *
-xrealloc (p, n)
-     void *p;
-     size_t n;
+xrealloc (void *p, size_t n)
 {
   p = realloc (p, n);
-  if (p == 0)
+  if (p == NULL)
     xalloc_fail (n);
   return p;
 }
@@ -133,7 +130,7 @@ xcalloc (n, s)
   void *p;
 
   p = calloc (n, s);
-  if (p == 0)
+  if (p == NULL)
     xalloc_fail ();
   return p;
 }
@@ -150,10 +147,18 @@ int xasprintf(char **strp, const char *fmt, ...) {
 }
 
 int xvasprintf(char **strp, const char *fmt, va_list ap) {
+#ifdef HAVE_MINGW
+	char buf[1024];
+	int result = vsnprintf(buf, sizeof buf, fmt, ap);
+	if(result < 0)
+		exit(xalloc_exit_failure);
+	*strp = xstrdup(buf);
+#else
 	int result = vasprintf(strp, fmt, ap);
 	if(result < 0) {
 		fprintf(stderr, "vasprintf() failed: %s\n", strerror(errno));
   		exit(xalloc_exit_failure);
 	}
+#endif
 	return result;
 }