diff options
| author |   guenther <guenther@openbsd.org> | 2020-11-14 20:53:31 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2020-11-14 20:53:31 +0000 |
| commit | 598e0fa840a6086bb9e40d03de1b9ba67d23b3d8 (patch) | |
| tree | 730f2466fce6e506bbc798555ff94b206e2e3c5d | |
| parent | Make sure not to replace 0.0.0.0 with dynamic address if it is a a network (diff) | |
| download | wireguard-openbsd-598e0fa840a6086bb9e40d03de1b9ba67d23b3d8.tar.xz wireguard-openbsd-598e0fa840a6086bb9e40d03de1b9ba67d23b3d8.zip | |
Constify dktypenames and fstypenames in libc.
Adjust variable declaration in disklabel to match.
ok millert@ deraadt@
| -rw-r--r-- | lib/libc/gen/disklabel.c | 6 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 8 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index cacde610389..a438a6b4815 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -42,7 +42,7 @@ #include <string.h> #include <unistd.h> -static u_int gettype(char *, char **); +static u_int gettype(char *, const char * const *); struct disklabel * getdiskbyname(const char *name) @@ -145,9 +145,9 @@ getdiskbyname(const char *name) } static u_int -gettype(char *t, char **names) +gettype(char *t, const char * const *names) { - char **nm; + const char * const *nm; for (nm = names; *nm; nm++) if (strcasecmp(t, *nm) == 0) diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 45d7e6c944a..001a50f3e9e 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.235 2019/06/28 13:32:43 deraadt Exp $ */ +/* $OpenBSD: disklabel.c,v 1.236 2020/11/14 20:53:31 guenther Exp $ */ /* * Copyright (c) 1987, 1993 @@ -809,10 +809,12 @@ duid_parse(struct disklabel *lp, char *s) int getasciilabel(FILE *f, struct disklabel *lp) { - char **cpp, *cp; + const char * const *cpp; + const char *s; + char *cp; const char *errstr; struct partition *pp; - char *mp, *tp, *s, line[BUFSIZ]; + char *mp, *tp, line[BUFSIZ]; char **omountpoints = NULL; int lineno = 0, errors = 0; u_int32_t v, fsize; diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 0d13a3fe9d0..f1034e6a209 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.76 2020/05/10 00:56:06 guenther Exp $ */ +/* $OpenBSD: disklabel.h,v 1.77 2020/11/14 20:53:31 guenther Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -211,7 +211,7 @@ struct __partitionv0 { /* old (v0) partition table entry */ #define DTYPE_RDROOT 15 /* ram disk root */ #ifdef DKTYPENAMES -static char *dktypenames[] = { +static const char * const dktypenames[] = { "unknown", "SMD", "MSCP", @@ -262,7 +262,7 @@ static char *dktypenames[] = { #define FS_UDF 21 /* UDF (DVD) filesystem */ #ifdef DKTYPENAMES -static char *fstypenames[] = { +static const char * const fstypenames[] = { "unused", "swap", "Version6", |