[src/trunk]: src/sbin/raidctl Follow the ioctl arg changes of RAIDFRAME_GET_C...

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c0dd8f88a65
branches:  trunk
changeset: 321590:8c0dd8f88a65
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sat Mar 24 19:41:35 2018 +0000

description:
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.

diffstat:

 sbin/raidctl/raidctl.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r ce57e56b17d9 -r 8c0dd8f88a65 sbin/raidctl/raidctl.c
--- a/sbin/raidctl/raidctl.c    Sat Mar 24 18:34:43 2018 +0000
+++ b/sbin/raidctl/raidctl.c    Sat Mar 24 19:41:35 2018 +0000
@@ -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 @@
        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 @@
        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 @@
        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 @@
                if (gettimeofday(&current_time,NULL) == -1)
                        err(1, "gettimeofday failed!?!?");
 
-               do_ioctl( fd, option, &pInfoPtr, "");
+               do_ioctl( fd, option, pInfoPtr, "");
                
 
        }