From nobody Fri Jan 28 09:17:37 2022 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 618451990ABC; Fri, 28 Jan 2022 09:17:37 +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 4JlX0x2LBZz4lsY; Fri, 28 Jan 2022 09:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643361457; 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=uLeq1Th2SdOCq84yo199PEiu3GW6Fi0dCY6uKjSFEFM=; b=QQXxb4XSo2RXFFU3EZf9fzOP5F79aIqE/VFFCSw7LZf2x5kbA3WEIG0CiQvkL+5eVufyRa l7ik0qKqQNnCeRO1csrYRFsQFm+ZaAgIZNrtpmtcFyr8TYnhGRT33CSSa6XyK4+muKu4rm cVGzOYHuiDlthF9vafzdkDkDPenOuTgkx1fhiWpWSDluSj6kXdPRf74gaY6KDXLKy6lIts Vn25ZKx9Ut7MMB424/JT4Pu3jLYGoVWVAekEdX4dIl+3hUD5TOo1BSsQ5I8pWP410+qsGL wN5oHHxFxs4+CTqBm5QJF5wJnwx5IGceHuSmBpz0NBdA6z9s1UMzMo3gNlszAA== 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 2D6332737F; Fri, 28 Jan 2022 09:17:37 +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 20S9HbNv052474; Fri, 28 Jan 2022 09:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20S9HbtL052473; Fri, 28 Jan 2022 09:17:37 GMT (envelope-from git) Date: Fri, 28 Jan 2022 09:17:37 GMT Message-Id: <202201280917.20S9HbtL052473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f95498601547 - main - disextract: eliminate last use of __DECONST 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f95498601547f7aeb76426fb3282b51ceb59eb6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643361457; 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=uLeq1Th2SdOCq84yo199PEiu3GW6Fi0dCY6uKjSFEFM=; b=vqXqaOJaJK3G1vmxsd1Pn+79wojtB8JMBxTy8pEFQj2Cvs+VsarMypUxfQvl+kDrpjOojB gDSaA8jqHo9JhYPb2J1Iz3FOQxQctaRCCXtsgs7syhd/awkskNQaMUMicFkIMQlSK20MZ4 CDhCC2WLA0gxYAlUWzlLwsTS8WpDJPdQf3n6gB805wZFJSIVoWTGx/X1jAwFS5jowZBVIW MSpBLvb8pAJy0mGusjjYHHOpbEpv8hMWlHYzF5rXxHiinv0TjiqyTjUq6L3df80e8EuAts IQ+1rgHQMFNTP55m4FEhohcPM6hgHXImz0eSxepuigjeOlIAcW5KOk613sZs0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643361457; a=rsa-sha256; cv=none; b=ny/lICvGcx1TFq1mGQmQ9hGD51pLPBZH1QMPdFvB1Gr0jEImM9al+qP7iLb7GPX3bDpCxs reSs6ku2WTqH0lW0kXxEk3QqaXyHYF5jBrVre/W9w3V8uuIo1fHdikI7RJGhmfLOnCW3WR mfYTu8ClqFGlOl5dhPtVVzmZ+j6S/1jNktqDC69sVofBZ8d/m+trJ+KXdb2zoEQx8x+lrY UYAmi9I9P8rM9pYLqgxlZA0xHmzjROKBvmoXrbBxM9Uy8hxp/6UDlvtKpTVocA+Dclimox qdslQf2fHU5hv0xTpx+hrT6VinHnt5Z9lNzRMetuGX6ed5yAJsm7p8IaQnOmRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f95498601547f7aeb76426fb3282b51ceb59eb6f commit f95498601547f7aeb76426fb3282b51ceb59eb6f Author: Baptiste Daroussin AuthorDate: 2022-01-28 09:09:08 +0000 Commit: Baptiste Daroussin CommitDate: 2022-01-28 09:09:08 +0000 disextract: eliminate last use of __DECONST --- usr.sbin/bsdinstall/distextract/distextract.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c index 81931e7cf50d..f7f973fe336c 100644 --- a/usr.sbin/bsdinstall/distextract/distextract.c +++ b/usr.sbin/bsdinstall/distextract/distextract.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include /* Data to process */ -static char *distdir = NULL; +static const char *distdir = NULL; static struct archive *archive = NULL; /* Function prototypes */ @@ -74,7 +74,7 @@ main(void) if ((distributions = getenv("DISTRIBUTIONS")) == NULL) errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set"); if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL) - distdir = __DECONST(char *, ""); + distdir = ""; if ((distribs = strdup(distributions)) == NULL) errx(EXIT_FAILURE, "memory error"); @@ -128,7 +128,7 @@ main(void) snprintf(error, sizeof(error), "Could not change to directory %s: %s\n", chrootdir, strerror(errno)); - conf.title = __DECONST(char *, "Error"); + conf.title = "Error"; bsddialog_msgbox(&conf, error, 0, 0); bsddialog_end(); return (EXIT_FAILURE);