From nobody Wed Dec 13 23:22:47 2023 X-Original-To: dev-commits-src-branches@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 4SrBNS116Bz54TMq; Wed, 13 Dec 2023 23:22:48 +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 4SrBNS0Tcnz3cGw; Wed, 13 Dec 2023 23:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509768; 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=GuIkdIPhBYO2emBifqboiilhBpVA1Mvujfi2fZUH0TA=; b=Du1H+XvjvCUEsOUYs691Vlb8YjD5rVYPVUwc8gSvYHeCBgqmuFXvvH2sqlQQECzFJUhWQV rqZduZUofc6O8Ryx3WFv5pyQURaJ2BVuoaOwLgP7kxvD5sZxJOJEfa/Jy5htMPOM7eOeT5 wXp+aB9OxAZlNTfkJyYtMaRy1/OEfbrFceyKXZx96SgMBjfBzHCrIAqPg21HD6uc2uyWUq mV7RgalS4UK0V2QXDbPu4oRjR2YvIx7lyOR0GQZfXHZd9bXxG1d+oKS5Ew0DaGlWLuZUU2 XfnDROdSwhd9oeUibAsM2s1G/VUMaDib0iI7G7cEtz9xsah0TyBu2WTGG5hxCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702509768; a=rsa-sha256; cv=none; b=KACyTNTDXRE47eo3o4TCdV3SAEQnUuj2BjzN81YnbaPzXJaKjTJSnUdX3KCmV5vXpJfweV IaRrbc/amK7k7nRCIrvHkTqFX1fBz6GG6A6/O6ZSyQtEAJz8wzu16o38Uc1iN/EH+ceAte QItovwLw60332MqrrhQOLphTuYvOPXltoRREpJNzStGULPLWNLGd1YH3FBQfJaz02pHbgQ sJORWjgO30/MQKAjoK5OKv9gZMZeGm3py98TbqC/h05Txf71/5jxNJiU0xVbfak892+rSb 2S6BvqatdOheFtMLYdcyeguvJ4VY/1ZdZpsxkbNxiLirIi7CwvqG+PsmyidpiA== 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=1702509768; 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=GuIkdIPhBYO2emBifqboiilhBpVA1Mvujfi2fZUH0TA=; b=BI2wQsCbKTIu2QfUiv5OGt4uTFBaXZloHyk7f2+X9ihi+tNAeMpwmPJcLJ510S4cX8JIlm V/DnZIIRRaXVP916aSrTZb+9w96mOeO+kyqbTlqWYOpkGiV0NeYKw3tgSWLTh0AlHLMM4C RTlY8BIdXxItyOU7PH17bOG0xGDnuCvcFI0epVV/EWNJD2bOLgvMJH4MH+XJRLiRuQXlVa TtPe/9LP0awSRBuwR1H3ghUKbe9YXmTZrdlVFwA1lsCWV9wIWx2wrzxIy5SoTXtSNLjbrY JTcV4SaoFpyhare/RYZ5RwSE0AEBiE5QMReYsr212njGquh2BXY0g+5ntfoSCQ== 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 4SrBNR6dWhz1Hhd; Wed, 13 Dec 2023 23:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDNMlA2024479; Wed, 13 Dec 2023 23:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDNMlOg024476; Wed, 13 Dec 2023 23:22:47 GMT (envelope-from git) Date: Wed, 13 Dec 2023 23:22:47 GMT Message-Id: <202312132322.3BDNMlOg024476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 0f6bc5ca95b7 - stable/14 - vis: relocate _DIAGASSERT() define List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0f6bc5ca95b73f42d70b8879daf969304c9c21b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0f6bc5ca95b73f42d70b8879daf969304c9c21b6 commit 0f6bc5ca95b73f42d70b8879daf969304c9c21b6 Author: Brooks Davis AuthorDate: 2023-11-21 00:21:11 +0000 Commit: Brooks Davis CommitDate: 2023-12-13 23:08:49 +0000 vis: relocate _DIAGASSERT() define Other similar files from NetBSD define it unconditionally as a local diff. Reviewed by: imp (as part of D42686) (cherry picked from commit db94e7c3f9a2344958667e756015393ad3124b3e) --- contrib/libc-vis/vis.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/libc-vis/vis.c b/contrib/libc-vis/vis.c index fc3b50d6c7a5..2f9eab25b480 100644 --- a/contrib/libc-vis/vis.c +++ b/contrib/libc-vis/vis.c @@ -61,7 +61,6 @@ __RCSID("$NetBSD: vis.c,v 1.83 2023/08/12 12:48:52 riastradh Exp $"); #endif /* LIBC_SCCS and not lint */ #ifdef __FBSDID __FBSDID("$FreeBSD$"); -#define _DIAGASSERT(x) assert(x) #endif #include "namespace.h" @@ -86,6 +85,8 @@ __weak_alias(strvisx,_strvisx) #include #include +#define _DIAGASSERT(x) assert(x) + /* * The reason for going through the trouble to deal with character encodings * in vis(3), is that we use this to safe encode output of commands. This