diff --git a/libc/dns/freeresolvconf.c b/libc/dns/freeresolvconf.c deleted file mode 100644 index 84b0db655..000000000 --- a/libc/dns/freeresolvconf.c +++ /dev/null @@ -1,32 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/dns/resolvconf.h" -#include "libc/mem/mem.h" -#include "libc/runtime/runtime.h" - -/** - * Frees resolv.conf data structure populated by ParseResolvConf(). - */ -void FreeResolvConf(struct ResolvConf **rvp) { - if (*rvp) { - free((*rvp)->nameservers.p); - free(*rvp); - *rvp = 0; - } -} diff --git a/libc/dns/getresolvconf.c b/libc/dns/getresolvconf.c index c729e2194..1d19de199 100644 --- a/libc/dns/getresolvconf.c +++ b/libc/dns/getresolvconf.c @@ -21,6 +21,7 @@ #include "libc/fmt/fmt.h" #include "libc/intrin/pushpop.h" #include "libc/macros.internal.h" +#include "libc/mem/mem.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/sock/struct/sockaddr.h" @@ -66,3 +67,18 @@ const struct ResolvConf *GetResolvConf(void) { pthread_mutex_unlock(&init->lock); return g_resolvconf; } + +/** + * Frees resolv.conf data structure populated by ParseResolvConf(). + */ +void FreeResolvConf(struct ResolvConf **rvp) { + if (*rvp) { + if ((*rvp)->nameservers.p != g_resolvconf_init.nameservers) { + free((*rvp)->nameservers.p); + } + if (*rvp != &g_resolvconf_init.rv) { + free(*rvp); + } + *rvp = 0; + } +}