From nobody Mon Jun 29 15:52:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gprPm5374z6jNlX for ; Mon, 29 Jun 2026 15:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprPm1m4rz3L4b for ; Mon, 29 Jun 2026 15:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSiUj8m9zFAQjcWt+POi4ZQ3oCobOlQdsofh/JfVALA=; b=d/6HT1OKdQ36zKPUF5gSnLNxZ1eQxnF9uDDpTgWnpFHxYkpm2pOQmX3uoe9I0sNffnzUVy OyuNK3zKk4LSBP3MNnuGZ5uyPn3l5s3Hl+FNnYaoaXU6pdVnwTH9r92hkF0HBYgf3KBl0Z 5N1sMXDaK3KpRB+MNUFmiarQ+Yj6+D5r0UmRtL/0B2v4+r8QUwOFoaNPPvFUyJLEU9Rm/4 mI151oS6KoLwdlIsT47enoGA3+5JV4JtKCI00M/FTWh2UTDH5Mlxtt9KIr6CHdwd0kt1LM Z3efF7QGHid9R/tPNafXRoy1M4bAMH2BiKBQZ5z4WSUTEhU8LJJ7bhdufx4+vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748332; a=rsa-sha256; cv=none; b=PCeikGhbaEbqB3y3r7m1FF+4CQOnBrXih4b6xvIHocEkWYJv4B7SAhnW3+T7C4GZfswxiR w+dyt7bhg9jILjOOdkhDZdso2eKh5Z/c+gquJBOQdG7fNxx9UcSpHFSuRQczIkgLCdMQ83 VRxC01bgDeIVSc7mKugCthOIujuhCx1JyYVdLUEjz853T5Jxmn9ZBSDkbJ9E1JFTzxIail 9+5dzxC7DQgndSTYp/oz/RvI5+uOQ5ugS3jeDrPYaNRBTsdEqxKZ8Nzuj+MDgsukiDVEuY WP7nY/+FFBeK8HpMFAq3xUsaFNTqi7dQo4gegKg/N97f227c8YlTa7/qs1byGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSiUj8m9zFAQjcWt+POi4ZQ3oCobOlQdsofh/JfVALA=; b=QWm9Y+32bzquiafsXK1+jMkkVR1DRhIMy1mv6/aOVeY3asstevJTkbpPfnEZNtEOt6Qvrx Cy9kLbo3xo9wQ4DMuLgx4vYgvowl7MopgD8QCwLbcFXWAf2pL3RmYmBfgzD8PHlP18yMmJ uGB3tx5uigb4bCCWANCKlLbm2sIlHiNqLxjPBDtqTXjIejmZv4H8aB4rb/jHW3nFiLv6+E ew5N0rXpuYFTl9eDCEYFuCIsnoKjIa6tZ7BxmIq6Ip+Jfdz+afdCno1AbYNFiFbLuqffMs YJFM/iy0eoQY++5U5xmnCDpwd+ngRz1ZES7OzNeP7EgFKk4rZOGLi+A0fsDybA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprPm0rT4z13JJ for ; Mon, 29 Jun 2026 15:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c14f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5028a8489f54 - main - libc/resolv: Dead code and style cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5028a8489f54fcf0a96399059c14e28c6a69d159 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:52:12 +0000 Message-Id: <6a4294ac.3c14f.361d7f48@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5028a8489f54fcf0a96399059c14e28c6a69d159 commit 5028a8489f54fcf0a96399059c14e28c6a69d159 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-27 22:58:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 13:49:19 +0000 libc/resolv: Dead code and style cleanup --- lib/libc/resolv/res_init.c | 59 +++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 42 deletions(-) diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index c7eda833f3d5..64522ef8f562 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -4,7 +4,7 @@ * Copyright (c) 1985, 1989, 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 2026 Dag-Erling Smørgrav - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,7 +16,7 @@ * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -32,14 +32,14 @@ /* * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -133,9 +133,8 @@ static int res_setsortlist(res_state, int, const char *, const char *); * Return 0 if completes successfully, -1 on error */ int -res_ninit(res_state statp) { - extern int __res_vinit(res_state, int); - +res_ninit(res_state statp) +{ return (__res_vinit(statp, 0)); } @@ -153,7 +152,6 @@ __res_vinit(res_state statp, int preinit) .sin_port = htons(NAMESERVER_PORT), .sin_addr = { htonl(INADDR_LOOPBACK) }, } }, -#ifdef HAS_INET6_STRUCTS { .sin6 = { .sin6_family = AF_INET6, #ifdef HAVE_SA_LEN @@ -162,7 +160,6 @@ __res_vinit(res_state statp, int preinit) .sin6_port = htons(NAMESERVER_PORT), .sin6_addr = IN6ADDR_LOOPBACK_INIT, } }, -#endif }; char *cp, **pp; int dots; @@ -190,7 +187,7 @@ __res_vinit(res_state statp, int preinit) statp->_u._ext.nscount = 0; statp->_u._ext.ext = malloc(sizeof(*statp->_u._ext.ext)); if (statp->_u._ext.ext != NULL) { - memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext)); + memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext)); statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr; strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa"); strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int"); @@ -829,7 +826,8 @@ freebsd15_res_rndinit(res_state statp) __sym_compat(__res_rndinit, freebsd15_res_rndinit, FBSD_1.4); u_int -res_nrandomid(res_state statp) { +res_nrandomid(res_state statp) +{ (void) statp; return ((u_int)(arc4random() & 0xffff)); @@ -843,10 +841,11 @@ res_nrandomid(res_state statp) { * This routine is not expected to be user visible. */ void -res_nclose(res_state statp) { +res_nclose(res_state statp) +{ int ns; - if (statp->_vcsock >= 0) { + if (statp->_vcsock >= 0) { (void) _close(statp->_vcsock); statp->_vcsock = -1; statp->_flags &= ~(RES_F_VC | RES_F_CONN); @@ -860,7 +859,8 @@ res_nclose(res_state statp) { } void -res_ndestroy(res_state statp) { +res_ndestroy(res_state statp) +{ res_nclose(statp); if (statp->_u._ext.ext != NULL) { free(statp->_u._ext.ext); @@ -869,22 +869,6 @@ res_ndestroy(res_state statp) { statp->options &= ~RES_INIT; } -#ifndef _LIBC -const char * -res_get_nibblesuffix(res_state statp) { - if (statp->_u._ext.ext) - return (statp->_u._ext.ext->nsuffix); - return ("ip6.arpa"); -} - -const char * -res_get_nibblesuffix2(res_state statp) { - if (statp->_u._ext.ext) - return (statp->_u._ext.ext->nsuffix2); - return ("ip6.int"); -} -#endif - void res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) { @@ -912,8 +896,6 @@ res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) statp->nsaddr_list[nserv].sin_family = 0; nserv++; break; - -#ifdef HAS_INET6_STRUCTS case AF_INET6: size = sizeof(set->sin6); if (statp->_u._ext.ext) @@ -926,8 +908,6 @@ res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) statp->nsaddr_list[nserv].sin_family = 0; nserv++; break; -#endif - default: break; } @@ -937,7 +917,8 @@ res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) } int -res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { +res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) +{ int i; size_t size; u_int16_t family; @@ -945,7 +926,7 @@ res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { for (i = 0; i < statp->nscount && i < cnt; i++) { if (statp->_u._ext.ext) family = statp->_u._ext.ext->nsaddrs[i].sin.sin_family; - else + else family = statp->nsaddr_list[i].sin_family; switch (family) { @@ -959,8 +940,6 @@ res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { memcpy(&set->sin, &statp->nsaddr_list[i], size); break; - -#ifdef HAS_INET6_STRUCTS case AF_INET6: size = sizeof(set->sin6); if (statp->_u._ext.ext) @@ -971,8 +950,6 @@ res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { memcpy(&set->sin6, &statp->nsaddr_list[i], size); break; -#endif - default: set->sin.sin_family = 0; break; @@ -981,5 +958,3 @@ res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { } return (statp->nscount); } - -/*! \file */