From: kn Date: Wed, 15 Nov 2023 20:23:19 +0000 (+0000) Subject: Constify disk_map()'s path argument X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0930cb9293866d47da09cff04448e4d8d4be0cc5;p=openbsd Constify disk_map()'s path argument The disklabel UID passed in is not modified, reflect that and allow callers using 'const char *'. OK miod --- diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index f90d41d14a5..bf169beff2e 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.271 2023/02/10 07:00:12 miod Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.272 2023/11/15 20:23:19 kn Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -1754,7 +1754,7 @@ done: } int -disk_map(char *path, char *mappath, int size, int flags) +disk_map(const char *path, char *mappath, int size, int flags) { struct disk *dk, *mdk; u_char uid[8]; diff --git a/sys/sys/disk.h b/sys/sys/disk.h index a024bb1c4a7..2219f974e46 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.37 2022/09/11 19:34:40 miod Exp $ */ +/* $OpenBSD: disk.h,v 1.38 2023/11/15 20:23:19 kn Exp $ */ /* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */ /* @@ -152,7 +152,7 @@ struct device *disk_lookup(struct cfdriver *, int); char *disk_readlabel(struct disklabel *, dev_t, char *, size_t); -int disk_map(char *, char *, int, int); +int disk_map(const char *, char *, int, int); int duid_iszero(u_char *); const char *duid_format(u_char *);