CVS commit: src/sbin/raidctl

[Takeshi Nakayama]

Module Name:    src
Committed By:   nakayama
Date:           Sat Mar 24 19:41:35 UTC 2018

Modified Files:
        src/sbin/raidctl: raidctl.c

Log Message:
Follow the ioctl arg changes of RAIDFRAME_GET_COMPONENT_LABEL and
RAIDFRAME_CHECK_*_STATUS_EXT.

This should fix strange raidctl -s outputs reported in
current-users ML.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.66 src/sbin/raidctl/raidctl.c:1.67
--- src/sbin/raidctl/raidctl.c:1.66	Thu Jan 18 00:32:49 2018
+++ src/sbin/raidctl/raidctl.c	Sat Mar 24 19:41:35 2018
@@ -1,4 +1,4 @@
-/*      $NetBSD: raidctl.c,v 1.66 2018/01/18 00:32:49 mrg Exp $   */
+/*      $NetBSD: raidctl.c,v 1.67 2018/03/24 19:41:35 nakayama Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: raidctl.c,v 1.66 2018/01/18 00:32:49 mrg Exp $");
+__RCSID("$NetBSD: raidctl.c,v 1.67 2018/03/24 19:41:35 nakayama Exp $");
 #endif
 
 
@@ -653,7 +653,7 @@ rf_output_configuration(int fd, const ch
 	component_label.row = component_num / num_cols;
 	component_label.column = component_num % num_cols;
 	label_ptr = &component_label;
-	do_ioctl(fd, RAIDFRAME_GET_COMPONENT_LABEL, &label_ptr,
+	do_ioctl(fd, RAIDFRAME_GET_COMPONENT_LABEL, label_ptr,
 		  "RAIDFRAME_GET_COMPONENT_LABEL");
 
 	printf("START layout\n");
@@ -753,7 +753,7 @@ get_component_label(int fd, char *compon
 	component_label.column = component_num % num_cols;
 
 	label_ptr = &component_label;
-	do_ioctl( fd, RAIDFRAME_GET_COMPONENT_LABEL, &label_ptr,
+	do_ioctl( fd, RAIDFRAME_GET_COMPONENT_LABEL, label_ptr,
 		  "RAIDFRAME_GET_COMPONENT_LABEL");
 
 	printf("Component label for %s:\n",component);
@@ -1027,7 +1027,7 @@ do_meter(int fd, u_long option)
 	pInfoPtr=&progressInfo;
 
 	percent_done = 0;
-	do_ioctl(fd, option, &pInfoPtr, "");
+	do_ioctl(fd, option, pInfoPtr, "");
 	start_value = progressInfo.completed;
 	current_time = start_time;
 	simple_eta = 0;
@@ -1090,7 +1090,7 @@ do_meter(int fd, u_long option)
 		if (gettimeofday(&current_time,NULL) == -1)
 			err(1, "gettimeofday failed!?!?");
 
-		do_ioctl( fd, option, &pInfoPtr, "");
+		do_ioctl( fd, option, pInfoPtr, "");
 		
 
 	}