diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-01-28 09:09:08 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-01-28 09:09:08 +0000 |
| commit | f95498601547f7aeb76426fb3282b51ceb59eb6f (patch) | |
| tree | d5907bbddce91aa1f3e3be3dca16c43d9b5cf1a5 | |
| parent | dd8ca6b27f69f841ab2e0f1424fe766034469205 (diff) | |
| download | src-f95498601547f7aeb76426fb3282b51ceb59eb6f.tar.gz src-f95498601547f7aeb76426fb3282b51ceb59eb6f.zip | |
disextract: eliminate last use of __DECONST
| -rw-r--r-- | usr.sbin/bsdinstall/distextract/distextract.c | 6 |
1 files 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 <unistd.h> /* 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); |