Changeset 0156c42 for lib

Timestamp:

2017-04-06T20:25:08Z (8 years ago)

Author:

Wilmer van der Gaast <github@…>

Branches:

master

Children:

b097945

Parents:

d179fd90

git-author:

Wilmer van der Gaast <wilmer@…> (03-04-17 20:57:11)

git-committer:

Wilmer van der Gaast <github@…> (06-04-17 20:25:08)

Message:

Remove ip6_*wrap() functions which are no longer needed.

Location:

lib

Files:

• misc.c (modified) (1 diff)
• misc.h (modified) (1 diff)

lib/misc.c

@@ -335 +335 @@
 }
 
-/* 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.
 

lib/misc.h

@@ -131 +131 @@
 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);