From: Karel Zak <kzak@redhat.com>
Date: Fri, 20 Jul 2018 12:15:42 +0000 (+0200)
Subject: libmount: cleanup const in umount code
X-Git-Tag: v2.33-rc1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea927bde6bc1b1bebb04081b516a46e18b95fc41;p=thirdparty%2Futil-linux.git

libmount: cleanup const in umount code

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index b28e6faea1..645fefb6aa 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -326,8 +326,8 @@ static int lookup_umount_fs(struct libmnt_context *cxt)
 static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
 {
 	uintmax_t offset = 0;
-	const char *src;
-	char *val, *optstr;
+	const char *src, *optstr;
+	char *val;
 	size_t valsz;
 	int flags = 0;
 
@@ -340,7 +340,7 @@ static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
 		return 0;
 
 	/* check for the offset option in @fs */
-	optstr = (char *) mnt_fs_get_user_options(fs);
+	optstr = mnt_fs_get_user_options(fs);
 
 	if (optstr &&
 	    mnt_optstr_get_option(optstr, "offset", &val, &valsz) == 0) {
@@ -597,7 +597,7 @@ static int exec_helper(struct libmnt_context *cxt)
 		    && strchr(type, '.')
 		    && !endswith(cxt->helper, type)) {
 			args[i++] = "-t";			/* 8 */
-			args[i++] = (char *) type;		/* 9 */
+			args[i++] = type;			/* 9 */
 		}
 		if (namespace) {
 			args[i++] = "-N";			/* 10 */