[PATCH 08/10] fix compiler warnings around get_output use of argv

[Benny Halevy <benny@xxxxxxxxxx>]

From: Benny Halevy <bhalevy@xxxxxxxxxx>

Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxx>
---
 ctl.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ctl.c b/ctl.c
index e5d16e3..f1d878d 100644
--- a/ctl.c
+++ b/ctl.c
@@ -52,7 +52,7 @@ static int __token_count(token_t *t);
 static const char * __token_next(token_t *t);
 static const char * __token_str(token_t *t);
 static int __token_next_int(token_t *t);
-static int get_output(char *prog, const char **argv);
+static int get_output(char *prog, char * const *argv);
 static char *find_dm_name(int major, int minor);
 static void hexdump(char *p, int len, int off);
 
@@ -277,7 +277,7 @@ get_vers(bl_comm_msg_t *msg, bl_comm_res_t *res, int *len)
 bl_comm_res_t *
 get_dm(bl_comm_msg_t *msg, bl_comm_res_t *res, int *lenp)
 {
-	const char	*argv[4] = {"dmsetup", "table", NULL, NULL};
+	char	*argv[4] = {"dmsetup", "table", NULL, NULL};
 	char	buf[128],
 		*name;
 	int	major,
@@ -298,7 +298,7 @@ get_dm(bl_comm_msg_t *msg, bl_comm_res_t *res, int *lenp)
 		return res;
 	}
 	argv[2] = name;
-	if (((fd = get_output("/sbin/dmsetup", argv)) == -1) ||
+	if (((fd = get_output("/sbin/dmsetup", (char * const *)argv)) == -1) ||
 	    ((fp = fdopen(fd, "r")) == NULL)) {
 		printf("%s: get_output/fdopen failed\n", __func__);
 		res->res_status = PNFS_BLOCK_FAILURE;
@@ -479,7 +479,7 @@ set_operation(int op)
 static char *
 find_dm_name(int major, int minor)
 {
-	const char	*argv[5] = {"dmsetup", "ls", "--target", "striped", NULL};
+	char * const argv[5] = {"dmsetup", "ls", "--target", "striped", NULL};
 	char		buf[128],
 			*name;
 	const char	*majmin;
@@ -549,7 +549,7 @@ error:
 }
 
 static int
-get_output(char *prog, const char **argv)
+get_output(char *prog, char * const *argv)
 {
 	int	fildes[2];
 	
@@ -567,13 +567,11 @@ get_output(char *prog, const char **argv)
 			close(fildes[0]);
 			dup2(fildes[1], 1);
 			dup2(fildes[1], 2);
-			if (execv(prog, argv) == -1) {
-				perror("execv");
-				exit(1);
-			}
-			break;
+			execv(prog, argv);
+			perror("execv");
+			exit(1);
 			
-			default:
+		default:
 			close(fildes[1]);
 			return fildes[0];
 	}
-- 
1.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html