Function is unused and can go.
Ross
--
Index: httpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/httpd/httpd.c,v
retrieving revision 1.68
diff -u -p -r1.68 httpd.c
--- httpd.c 9 Sep 2018 21:06:51 -0000 1.68
+++ httpd.c 26 Jul 2020 13:07:26 -0000
@@ -552,59 +552,6 @@ expand_string(char *label, size_t len, c
}
const char *
-canonicalize_host(const char *host, char *name, size_t len)
-{
- struct sockaddr_in sin4;
- struct sockaddr_in6 sin6;
- size_t i, j;
- size_t plen;
- char c;
-
- if (len < 2)
- goto fail;
-
- /*
- * Canonicalize an IPv4/6 address
- */
- if (inet_pton(AF_INET, host, &sin4) == 1)
- return (inet_ntop(AF_INET, &sin4, name, len));
- if (inet_pton(AF_INET6, host, &sin6) == 1)
- return (inet_ntop(AF_INET6, &sin6, name, len));
-
- /*
- * Canonicalize a hostname
- */
-
- /* 1. remove repeated dots and convert upper case to lower case */
- plen = strlen(host);
- memset(name, 0, len);
- for (i = j = 0; i < plen; i++) {
- if (j >= (len - 1))
- goto fail;
- c = tolower((unsigned char)host[i]);
- if ((c == '.') && (j == 0 || name[j - 1] == '.'))
- continue;
- name[j++] = c;
- }
-
- /* 2. remove trailing dots */
- for (i = j; i > 0; i--) {
- if (name[i - 1] != '.')
- break;
- name[i - 1] = '\0';
- j--;
- }
- if (j <= 0)
- goto fail;
-
- return (name);
-
- fail:
- errno = EINVAL;
- return (NULL);
-}
-
-const char *
url_decode(char *url)
{
char *p, *q;
Index: httpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/httpd/httpd.h,v
retrieving revision 1.147
diff -u -p -r1.147 httpd.h
--- httpd.h 25 Jul 2020 21:12:49 -0000 1.147
+++ httpd.h 26 Jul 2020 13:07:26 -0000
@@ -710,7 +710,6 @@ void event_again(struct event *, int,
int expand_string(char *, size_t, const char *, const char *);
const char *url_decode(char *);
char *url_encode(const char *);
-const char *canonicalize_host(const char *, char *, size_t);
const char *canonicalize_path(const char *, char *, size_t);
size_t path_info(char *);
char *escape_html(const char *);
