From nobody Thu Oct 13 18:38:58 2022 X-Original-To: dev-commits-src-main@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 4MpJFb0FC0z4fMcF; Thu, 13 Oct 2022 18:38:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MpJFZ6rlFz3w0j; Thu, 13 Oct 2022 18:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665686339; 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=1nspJTyqwxumg8yhPTq+C51KqjmZaJVbM7s/Cxy0EGE=; b=yNMCzH+LMi4N79h7h0qHt79XJ+8FlNc4EHGxmaFJedkBBNV0vnF8aZzjKEB3iNUhMtrDR0 SncX5hKMI9YGVW8kf1ohrQgvHwZezn42D1GEIXyNaPXqgziw2a8Wt4cmr7btfC+5u0QzwO cmoKsWCHXagxd2QRIAsuEDhHP+lXLuhgw0mX5g+XJfTA+TqpUao7lrJwTTe6vqa5wTSTxa jmPmUKgYF1qP1ST4WE9acTOHl3C8G60cyof8IzW1TUx6qa70DzFPQKB3cUjjZ/sW1m8+c7 k/9AXYBUmaPF6xG5MvsUwpwc/4AwmOMR7a9+zMtHdybdQicLP3EwCYQ7/BBORg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MpJFZ5fM7zWWc; Thu, 13 Oct 2022 18:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29DIcwh3035278; Thu, 13 Oct 2022 18:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DIcwF5035277; Thu, 13 Oct 2022 18:38:58 GMT (envelope-from git) Date: Thu, 13 Oct 2022 18:38:58 GMT Message-Id: <202210131838.29DIcwF5035277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2e0e27392732 - main - netinet6: trim overly long lines in GET_PKTOPT_VAR(), fit into 80 chars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e0e27392732a811b52c002a707ac848bad01b30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665686339; 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=1nspJTyqwxumg8yhPTq+C51KqjmZaJVbM7s/Cxy0EGE=; b=doRAJ2jJWNu6hmXwL2aKLG8MHMF/4UDGkNgsFZNUvBuOviYLtlDDPjtT2rJoI3V8vFXm6V hYUN4X+qswSH7YIPbl7I1qkVSFsFKd0aX7uzKBjYwPR3iUoFM6JSUyZufEWmR9Hk9MbJ6J TULb3lbSALpgM0ndqmBcoWFAdwPJSGV48OC2bm1FbLUAUWmOBU4tdu7Owuun6XqW9QEWL0 I4oZWWDqVZB+Pw0/X+8M6DUbokxQ45gdBY+T/PRxzz72iDNG0RcqPuRnH8duRudrhr/taU mM3S+ZesEfW7ghCG0ZcqWUPznxO3dCQJ7yiA0MU1uI1nQDEhsd5+yuqXsw0otg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665686339; a=rsa-sha256; cv=none; b=Wk56K2tkzF2i/qvjibafGixv9trHA4EUlUJvuwHD70m+DJifsUAySbg9ogYsZ7i3thEmkW aU2xrF/46jB9BmiNPvg19O7/nBDMWcMjzHTB6MhrMPjLY2i34AYWkz07nDncPw6Tiq6bdp kjduPrxZkFjOS1VoyHBJgr2CUc4N6r2iW4TVOO3czaJ2LOQZAseG5rIcxTACWZ2AIWI4xm EqrcpAl4aL7IkG17GKSmuUtNiI8Wv3Twc81mCFS0fK9s0IICV1ktCDcQKS944GKqNYTPmG LCmNUJYPDgZNUug2HwsndGuG1q9yLmKB7PLvTQ0bxouQrY9VjbcZplm+MAq50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2e0e27392732a811b52c002a707ac848bad01b30 commit 2e0e27392732a811b52c002a707ac848bad01b30 Author: Gleb Smirnoff AuthorDate: 2022-10-13 16:03:38 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-13 16:03:38 +0000 netinet6: trim overly long lines in GET_PKTOPT_VAR(), fit into 80 chars --- sys/netinet6/ip6_output.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index f00f718445f5..99c22343dced 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -2571,33 +2571,33 @@ ip6_pcbopt(int optname, u_char *buf, int len, struct ip6_pktopts **pktopt, return (ret); } -#define GET_PKTOPT_VAR(field, lenexpr) do { \ - if (pktopt && pktopt->field) { \ - INP_RUNLOCK(inp); \ - optdata = malloc(sopt->sopt_valsize, M_TEMP, M_WAITOK); \ - malloc_optdata = true; \ - INP_RLOCK(inp); \ - if (inp->inp_flags & INP_DROPPED) { \ - INP_RUNLOCK(inp); \ - free(optdata, M_TEMP); \ - return (ECONNRESET); \ - } \ - pktopt = inp->in6p_outputopts; \ - if (pktopt && pktopt->field) { \ - optdatalen = min(lenexpr, sopt->sopt_valsize); \ - bcopy(pktopt->field, optdata, optdatalen); \ - } else { \ - free(optdata, M_TEMP); \ - optdata = NULL; \ - malloc_optdata = false; \ - } \ - } \ +#define GET_PKTOPT_VAR(field, lenexpr) do { \ + if (pktopt && pktopt->field) { \ + INP_RUNLOCK(inp); \ + optdata = malloc(sopt->sopt_valsize, M_TEMP, M_WAITOK); \ + malloc_optdata = true; \ + INP_RLOCK(inp); \ + if (inp->inp_flags & INP_DROPPED) { \ + INP_RUNLOCK(inp); \ + free(optdata, M_TEMP); \ + return (ECONNRESET); \ + } \ + pktopt = inp->in6p_outputopts; \ + if (pktopt && pktopt->field) { \ + optdatalen = min(lenexpr, sopt->sopt_valsize); \ + bcopy(pktopt->field, optdata, optdatalen); \ + } else { \ + free(optdata, M_TEMP); \ + optdata = NULL; \ + malloc_optdata = false; \ + } \ + } \ } while(0) -#define GET_PKTOPT_EXT_HDR(field) GET_PKTOPT_VAR(field, \ +#define GET_PKTOPT_EXT_HDR(field) GET_PKTOPT_VAR(field, \ (((struct ip6_ext *)pktopt->field)->ip6e_len + 1) << 3) -#define GET_PKTOPT_SOCKADDR(field) GET_PKTOPT_VAR(field, \ +#define GET_PKTOPT_SOCKADDR(field) GET_PKTOPT_VAR(field, \ pktopt->field->sa_len) static int