Another big & bad commit:

[tinc] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index fc7abe4..8e460f4 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -21,15 +21,19 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "config.h"
 
 #include <utils.h>
 #include <syslog.h>
+#include <xalloc.h>
 
+#ifdef ENABLE_TRACING
 volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0};
 volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?"};
 volatile int cp_index = 0;
+#endif
 
 char *hexadecimals = "0123456789ABCDEF";
 
@@ -59,7 +63,8 @@ void bin2hex(char *src, char *dst, int length)
     }
 }
 
-char *cp_trace()
+#ifdef ENABLE_TRACING
+void cp_trace()
 {
   syslog(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d ...",
            cp_file[(cp_index+7)%8], cp_line[(cp_index+7)%8],
@@ -72,3 +77,33 @@ char *cp_trace()
            cp_file[cp_index], cp_line[cp_index]
         );
 }
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **buf, const char *fmt, ...)
+{
+  int status;
+  va_list ap;
+  int len;
+  
+  len = 4096;
+  *buf = xmalloc(len);
+
+  va_start(ap, fmt);
+  status = vsnprintf (*buf, len, fmt, ap);
+  va_end (ap);
+
+  if(status >= 0)
+    *buf = xrealloc(*buf, status);
+
+  if(status > len-1)
+    {
+      len = status;
+      va_start(ap, fmt);
+      status = vsnprintf (*buf, len, fmt, ap);
+      va_end (ap);
+    }
+
+  return status;
+}
+#endif