From: Martin Wilck <[email protected]> Use `const char *wwid` where possible.
Signed-off-by: Martin Wilck <[email protected]> Reviewed-by: Benjamin Marzinski <[email protected]> --- libmultipath/wwids.c | 19 ++++++++----------- libmultipath/wwids.h | 6 +++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c index aac18c0..42da2b7 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c @@ -24,8 +24,8 @@ * Copyright (c) 2010 Benjamin Marzinski, Redhat */ -static int -lookup_wwid(FILE *f, char *wwid) { +static int lookup_wwid(FILE *f, const char *wwid) +{ int c; char buf[LINE_MAX]; int count; @@ -57,8 +57,8 @@ next: return 0; } -static int -write_out_wwid(int fd, char *wwid) { +static int write_out_wwid(int fd, const char *wwid) +{ int ret; off_t offset; char buf[WWID_SIZE + 3]; @@ -189,9 +189,8 @@ do_remove_wwid(int fd, char *str) { } } - -int -remove_wwid(char *wwid) { +int remove_wwid(const char *wwid) +{ int fd = -1; int len, can_write; char *str; @@ -231,8 +230,7 @@ out: return ret; } -int -check_wwids_file(char *wwid, int write_wwid) +int check_wwids_file(const char *wwid, int write_wwid) { int fd, can_write, found, ret; FILE *f; @@ -321,8 +319,7 @@ should_multipath(struct path *pp1, vector pathvec, vector mpvec) return 1; } -int -remember_wwid(char *wwid) +int remember_wwid(const char *wwid) { int ret = check_wwids_file(wwid, 1); if (ret < 0){ diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h index ee47ad9..5606ac6 100644 --- a/libmultipath/wwids.h +++ b/libmultipath/wwids.h @@ -13,9 +13,9 @@ "# Valid WWIDs:\n" int should_multipath(struct path *pp, vector pathvec, vector mpvec); -int remember_wwid(char *wwid); -int check_wwids_file(char *wwid, int write_wwid); -int remove_wwid(char *wwid); +int remember_wwid(const char *wwid); +int check_wwids_file(const char *wwid, int write_wwid); +int remove_wwid(const char *wwid); int replace_wwids(vector mp); enum { -- 2.55.0
