From nobody Tue Jul 21 08:56:39 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 4h4B8916XFz6lbry for ; Tue, 21 Jul 2026 08:56:41 +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 4h4B876wPCz3cst for ; Tue, 21 Jul 2026 08:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784624200; 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=NB/d27CoV11Cq3nQ4vKNH2isLbwpHxoh2sHFCWVP4Ow=; b=Ae4siYyt+8+nc+JVPU5RrkXItFwPwsGVeYOiF83y/gBXtW5w2AEYQqWkmiURFRYDOlAusJ 1FKt3rjCFn8JLpHfvkN1ZyVX/8xdedEdGsZHqY81lc4J5gvK1jvv+yBT43QsPS/COIDeDe 3aHjyUTPG2xxhmSm89SrRK+GORVDanECFt8vnkDGKQk2bXLFiMOIw28xzyCQLJTCkMyW2p 9dr3pZsC2pl51jgNWkwjkQGXJA0/uqG8AO+RdLB59QbqEwgCQTgXSPWx1ejeoaE0FOebcU 9Q9nN0qC7pUs6uouU59iqfX+pUB2LS39wNsEu5Ul5jqmxWiN421qH6C4+CbFHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784624200; a=rsa-sha256; cv=none; b=TaS4toBAMnFjLPnGsITvmtHHkee9O/r+s0Ae0xp6MAU31pjhh/W/+vL9xkCqiaGzd/9wjw IJ5Tp5HgnN8HWxwaCGTq7I59jU1ShVxEwyi7CuZMayvc2XHF8hIh89JAF9IBOBOoxjm+wa VWqrFHlEzyt+eyFJcBgNZCkmce+gD0PF9YMMq7Ye/Iqei+mEZDNdin3WxWw1QDaqFZaU7V eTVUaKB+eddmNw4RS2KB35Gebu+jG88z5UaYSHOm4n2kXaOdJRMqvNvdId1IBRu6i0EizT nsv+RGqh8gRP8t58GVPINxOSZPdvXCTyhdO2fJuKuJF0ZcrTAYhqKEdv9ZnO3g== 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=1784624200; 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=NB/d27CoV11Cq3nQ4vKNH2isLbwpHxoh2sHFCWVP4Ow=; b=RJ8AZrqLKNPYoA/2EjXqJW0Fh+GJWiIBhrEUG2naELFJGPf+gof1Mk5XB08qdDhBfU1djL T91ifrhpTFgB7HUQC6mk5m7lk9YvKk6JlzEceM4FXbS9ND4YdFNHIXBePLydk/E9PnoTN6 lYHBa7Z7ZJj6mMFw2NFmFIJuEyQ7jRnozjCbF7KaghRoLj9aMGyXDfnZhZ1QNhKW6tQvZS LjKPIkH+hcbr8pi1ljOMF7VvoL1wXdhcNmjnWUL8TJCP2XBl6GBDF+lkoQB5FGTMy8l7i4 IFqDf9r5oQPZl2lDZAnqO3Mhss2VAcCLDR8dRpB0AxiEpn4oxWtYbupcfBAATg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4B8760Bdzj13 for ; Tue, 21 Jul 2026 08:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2162a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 08:56:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f4b82c7f40bc - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f4b82c7f40bc7ecadc759f76f6b66921010603ab Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 08:56:39 +0000 Message-Id: <6a5f3447.2162a.2f740654@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f4b82c7f40bc7ecadc759f76f6b66921010603ab commit f4b82c7f40bc7ecadc759f76f6b66921010603ab Author: Dag-Erling Smørgrav AuthorDate: 2026-07-06 12:23:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-21 08:54:42 +0000 libc/resolv: Dead code and style cleanup Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57928 (cherry picked from commit 4805b88edb009e53c4fee159138d2cbe0c848da7) --- 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 a9b2d5c582c8..25c7643c66b1 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"); @@ -828,7 +825,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)); @@ -842,10 +840,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); @@ -859,7 +858,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); @@ -868,22 +868,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) { @@ -911,8 +895,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) @@ -925,8 +907,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; } @@ -936,7 +916,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; @@ -944,7 +925,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) { @@ -958,8 +939,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) @@ -970,8 +949,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; @@ -980,5 +957,3 @@ res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) { } return (statp->nscount); } - -/*! \file */