From c111e07c4ac6e276c9399b56ca8fe342d78c96cc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 8 Mar 2012 20:55:58 +0100
Subject: Moved some code

---
 src/fastd.c | 182 ------------------------------------------------------------
 1 file changed, 182 deletions(-)

(limited to 'src/fastd.c')

diff --git a/src/fastd.c b/src/fastd.c
index cd1f1df..dd6d2fa 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -46,188 +46,6 @@
 extern fastd_method fastd_method_null;
 
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-security"
-
-void fastd_printf(const fastd_context *ctx, const char *format, ...) {
-	va_list ap;
-	va_start(ap, format);
-
-	char *format_dup = strdup(format);
-	char *str;
-	for (str = format_dup; *str; str++) {
-		if (*str != '%') {
-			fputc(*str, stderr);
-			continue;
-		}
-
-		int len, flag_l = 0, flag_L = 0, flag_j = 0, flag_z = 0, flag_t = 0;
-
-		for(len = 1; str[len]; len++) {
-			char last;
-			bool finished = true;
-			char addr_buf[INET6_ADDRSTRLEN];
-			void *p;
-			fastd_eth_addr *eth_addr;
-
-			switch (str[len]) {
-			case 'l':
-				flag_l++;
-				finished = false;
-				break;
-
-			case 'L':
-				flag_L++;
-				finished = false;
-				break;
-
-			case 'j':
-				flag_j++;
-				finished = false;
-				break;
-
-			case 'z':
-				flag_z++;
-				finished = false;
-				break;
-
-			case 't':
-				flag_t++;
-				finished = false;
-				break;
-
-			case '%':
-				fputc('%', stderr);
-				break;
-
-			case 'd':
-			case 'i':
-			case 'o':
-			case 'u':
-			case 'x':
-			case 'X':
-				last = str[len+1];
-				str[len+1] = 0;
-
-				if (flag_j)
-					fprintf(stderr, str, va_arg(ap, intmax_t));
-				else if (flag_z)
-					fprintf(stderr, str, va_arg(ap, size_t));
-				else if (flag_t)
-					fprintf(stderr, str, va_arg(ap, ptrdiff_t));
-				else if (flag_l == 0)
-					fprintf(stderr, str, va_arg(ap, int));
-				else if (flag_l == 1)
-					fprintf(stderr, str, va_arg(ap, long));
-				else
-					fprintf(stderr, str, va_arg(ap, long long));
-
-				str[len+1] = last;
-				break;
-
-			case 'e':
-			case 'f':
-			case 'F':
-			case 'g':
-			case 'G':
-			case 'a':
-			case 'A':
-				last = str[len+1];
-				str[len+1] = 0;
-
-				if (flag_L)
-					fprintf(stderr, str, va_arg(ap, long double));
-				else
-					fprintf(stderr, str, va_arg(ap, double));
-
-				str[len+1] = last;
-				break;
-
-			case 'c':
-				last = str[len+1];
-				str[len+1] = 0;
-
-				fprintf(stderr, str, va_arg(ap, int));
-
-				str[len+1] = last;
-				break;
-
-			case 's':
-			case 'p':
-				last = str[len+1];
-				str[len+1] = 0;
-
-				fprintf(stderr, str, va_arg(ap, void*));
-
-				str[len+1] = last;
-				break;
-
-			case 'm':
-				last = str[len+1];
-				str[len+1] = 0;
-
-				fprintf(stderr, str);
-
-				str[len+1] = last;
-				break;
-
-			case 'I':
-				p = va_arg(ap, void*);
-
-				if (p) {
-					if (inet_ntop(flag_l ? AF_INET6 : AF_INET, p, addr_buf, sizeof(addr_buf)))
-						fprintf(stderr, "%s", addr_buf);
-				}
-				else {
-					fprintf(stderr, "(null)");
-				}
-				break;
-
-			case 'E':
-				eth_addr = va_arg(ap, fastd_eth_addr*);
-
-				if (eth_addr) {
-					fprintf(stderr, "%02x:%02x:%02x:%02x:%02x:%02x",
-						eth_addr->data[0], eth_addr->data[1], eth_addr->data[2],
-						eth_addr->data[3], eth_addr->data[4], eth_addr->data[5]);
-				}
-				else {
-					fprintf(stderr, "(null)");
-				}
-				break;
-
-			case 'P':
-				p = va_arg(ap, void*);
-
-				if (p) {
-					char* str = ctx->conf->method->peer_str(ctx, (fastd_peer*)p);
-					fprintf(stderr, "%s", str);
-					free(str);
-				}
-				else {
-					fprintf(stderr, "(null)");
-				}
-				break;
-
-			default:
-				finished = false;
-			}
-
-			if (finished) {
-				str += len;
-				break;
-			}
-		}
-	}
-
-	free(format_dup);
-
-	va_end(ap);
-}
-
-#pragma GCC diagnostic pop
-
-
 static void init_tuntap(fastd_context *ctx) {
 	struct ifreq ifr;
 
-- 
cgit v1.2.3