From c4e66f028e36859c1562f7c400953873729c40d4 Mon Sep 17 00:00:00 2001 From: kevans Date: Sun, 18 Oct 2020 23:32:47 +0000 Subject: [PATCH] libbe(3): const'ify a couple arguments libbe will never need to mutate these as we either process them into a local buffer or we just don't touch them and write to a separate out argument. MFC after: 1 week --- lib/libbe/be.h | 6 +++--- lib/libbe/be_access.c | 6 +++--- lib/libbe/be_info.c | 2 +- lib/libbe/libbe.3 | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/libbe/be.h b/lib/libbe/be.h index 960b1adf245..87285f2d10a 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -112,8 +112,8 @@ typedef enum { BE_MNT_DEEP = 1 << 1, } be_mount_opt_t; -int be_mount(libbe_handle_t *, char *, char *, int, char *); -int be_unmount(libbe_handle_t *, char *, int); +int be_mount(libbe_handle_t *, const char *, const char *, int, char *); +int be_unmount(libbe_handle_t *, const char *, int); int be_mounted_at(libbe_handle_t *, const char *path, nvlist_t *); /* Error related functions: be_error.c */ @@ -125,7 +125,7 @@ void libbe_print_on_error(libbe_handle_t *, bool); int be_root_concat(libbe_handle_t *, const char *, char *); int be_validate_name(libbe_handle_t * __unused, const char *); int be_validate_snap(libbe_handle_t *, const char *); -int be_exists(libbe_handle_t *, char *); +int be_exists(libbe_handle_t *, const char *); int be_export(libbe_handle_t *, const char *, int fd); int be_import(libbe_handle_t *, const char *, int fd); diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 60375d0cbc1..74059a0a569 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -232,8 +232,8 @@ be_mounted_at(libbe_handle_t *lbh, const char *path, nvlist_t *details) * usage */ int -be_mount(libbe_handle_t *lbh, char *bootenv, char *mountpoint, int flags, - char *result_loc) +be_mount(libbe_handle_t *lbh, const char *bootenv, const char *mountpoint, + int flags, char *result_loc) { char be[BE_MAXPATHLEN]; char mnt_temp[BE_MAXPATHLEN]; @@ -288,7 +288,7 @@ be_mount(libbe_handle_t *lbh, char *bootenv, char *mountpoint, int flags, * usage */ int -be_unmount(libbe_handle_t *lbh, char *bootenv, int flags) +be_unmount(libbe_handle_t *lbh, const char *bootenv, int flags) { int err; char be[BE_MAXPATHLEN]; diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c index 745f4f9be23..81f3d46a720 100644 --- a/lib/libbe/be_info.c +++ b/lib/libbe/be_info.c @@ -305,7 +305,7 @@ be_prop_list_free(nvlist_t *be_list) * Usage */ int -be_exists(libbe_handle_t *lbh, char *be) +be_exists(libbe_handle_t *lbh, const char *be) { char buf[BE_MAXPATHLEN]; diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index b8bbc29cf1d..2ace6b361e6 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 22, 2020 +.Dd August 18, 2020 .Dt LIBBE 3 .Os .Sh NAME @@ -94,13 +94,13 @@ .\" BE_MNT_DEEP = 1 << 1, .\" } be_mount_opt_t .Ft int -.Fn be_mount "libbe_handle_t *hdl" "char *be_name" "char *mntpoint" "int flags" "char *result" +.Fn be_mount "libbe_handle_t *hdl" "const char *be_name" "const char *mntpoint" "int flags" "char *result" .Pp .Ft int .Fn be_mounted_at "libbe_handle_t *hdl" "const char *path" "nvlist_t *details" .Pp .Ft int -.Fn be_unmount "libbe_handle_t *hdl" "char *be_name" "int flags" +.Fn be_unmount "libbe_handle_t *hdl" "const char *be_name" "int flags" .Pp .Ft int .Fn libbe_errno "libbe_handle_t *hdl" @@ -121,7 +121,7 @@ .Fn be_validate_snap "libbe_handle_t *hdl" "const char *snap" .Pp .Ft int -.Fn be_exists "libbe_handle_t *hdl" "char *be_name" +.Fn be_exists "libbe_handle_t *hdl" "const char *be_name" .Pp .Ft int .Fn be_export "libbe_handle_t *hdl" "const char *be_name" "int fd" -- 2.45.0