From 0156c4220b58515294d7689ea69da8c215a33bdb Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 3 Apr 2017 21:57:11 +0100
Subject: Remove ip6_*wrap() functions which are no longer needed.

---
 lib/misc.c | 45 ---------------------------------------------
 lib/misc.h |  3 ---
 2 files changed, 48 deletions(-)

(limited to 'lib')

diff --git a/lib/misc.c b/lib/misc.c
index d79471c0..21f3ad2e 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -334,51 +334,6 @@ char *strip_newlines(char *source)
 	return source;
 }
 
-/* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
-char *ipv6_wrap(char *src)
-{
-	static char dst[64];
-	int i;
-
-	for (i = 0; src[i]; i++) {
-		if ((src[i] < '0' || src[i] > '9') && src[i] != '.') {
-			break;
-		}
-	}
-
-	/* Hmm, it's not even an IP... */
-	if (src[i]) {
-		return src;
-	}
-
-	g_snprintf(dst, sizeof(dst), "::ffff:%s", src);
-
-	return dst;
-}
-
-/* Unwrap an IPv4 address into IPv6 space. Thread-safe, because it's very simple. :-) */
-char *ipv6_unwrap(char *src)
-{
-	int i;
-
-	if (g_strncasecmp(src, "::ffff:", 7) != 0) {
-		return src;
-	}
-
-	for (i = 7; src[i]; i++) {
-		if ((src[i] < '0' || src[i] > '9') && src[i] != '.') {
-			break;
-		}
-	}
-
-	/* Hmm, it's not even an IP... */
-	if (src[i]) {
-		return src;
-	}
-
-	return (src + 7);
-}
-
 /* Convert from one charset to another.
 
    from_cs, to_cs: Source and destination charsets
diff --git a/lib/misc.h b/lib/misc.h
index 953abc25..ece4bbff 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -130,9 +130,6 @@ G_MODULE_EXPORT char *escape_html(const char *html);
 G_MODULE_EXPORT void http_decode(char *s);
 G_MODULE_EXPORT void http_encode(char *s);
 
-G_MODULE_EXPORT char *ipv6_wrap(char *src);
-G_MODULE_EXPORT char *ipv6_unwrap(char *src);
-
 G_MODULE_EXPORT signed int do_iconv(char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf);
 
 G_MODULE_EXPORT void random_bytes(unsigned char *buf, int count);
-- 
cgit v1.2.3