[src/trunk]: src fixes for GCC 6.4:

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

details:   https://anonhg.NetBSD.org/src/rev/37fadc330b9f
branches:  trunk
changeset: 359257:37fadc330b9f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 05 22:14:26 2018 +0000

description:
fixes for GCC 6.4:

- fix an indentation issue in radioioctl().
- fix an indentation issue in mpt_run_xfer().
- grep's printline() has some {} placement issues.

diffstat:

 sys/dev/ic/mpt_netbsd.c |  12 ++++++------
 sys/dev/radio.c         |   6 +++---
 usr.bin/grep/util.c     |  11 ++++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diffs (93 lines):

diff -r f66844eaee58 -r 37fadc330b9f sys/dev/ic/mpt_netbsd.c
--- a/sys/dev/ic/mpt_netbsd.c   Mon Feb 05 22:12:37 2018 +0000
+++ b/sys/dev/ic/mpt_netbsd.c   Mon Feb 05 22:14:26 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpt_netbsd.c,v 1.34 2018/01/30 20:20:38 jakllsch Exp $ */
+/*     $NetBSD: mpt_netbsd.c,v 1.35 2018/02/05 22:14:26 mrg Exp $      */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.34 2018/01/30 20:20:38 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.35 2018/02/05 22:14:26 mrg Exp $");
 
 #include "bio.h"
 
@@ -1093,11 +1093,11 @@
        if (mpt->verbose > 1)
                mpt_print_scsi_io_request(mpt_req);
 
-               if (xs->timeout == 0) {
-                       mpt_prt(mpt, "mpt_run_xfer: no timeout specified for request: 0x%x\n",
+       if (xs->timeout == 0) {
+               mpt_prt(mpt, "mpt_run_xfer: no timeout specified for request: 0x%x\n",
                        req->index);
-                       xs->timeout = 500;
-               }
+               xs->timeout = 500;
+       }
 
        s = splbio();
        if (__predict_true((xs->xs_control & XS_CTL_POLL) == 0))
diff -r f66844eaee58 -r 37fadc330b9f sys/dev/radio.c
--- a/sys/dev/radio.c   Mon Feb 05 22:12:37 2018 +0000
+++ b/sys/dev/radio.c   Mon Feb 05 22:14:26 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.28 2017/10/28 03:47:24 riastradh Exp $ */
+/* $NetBSD: radio.c,v 1.29 2018/02/05 22:14:26 mrg Exp $ */
 /* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
 /* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
 
@@ -30,7 +30,7 @@
 /* This is the /dev/radio driver from OpenBSD */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.28 2017/10/28 03:47:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.29 2018/02/05 22:14:26 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -148,7 +148,7 @@
                if (sc->hw_if->get_info)
                        error = (sc->hw_if->get_info)(sc->hw_hdl,
                                        (struct radio_info *)data);
-                       break;
+               break;
        case RIOCSINFO:
                if (sc->hw_if->set_info)
                        error = (sc->hw_if->set_info)(sc->hw_hdl,
diff -r f66844eaee58 -r 37fadc330b9f usr.bin/grep/util.c
--- a/usr.bin/grep/util.c       Mon Feb 05 22:12:37 2018 +0000
+++ b/usr.bin/grep/util.c       Mon Feb 05 22:14:26 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.18 2014/07/14 21:56:03 christos Exp $       */
+/*     $NetBSD: util.c,v 1.19 2018/02/05 22:14:26 mrg Exp $    */
 /*     $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $    */
 /*     $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $  */
 
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: util.c,v 1.18 2014/07/14 21:56:03 christos Exp $");
+__RCSID("$NetBSD: util.c,v 1.19 2018/02/05 22:14:26 mrg Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -478,9 +478,10 @@
                        if (color) 
                                fprintf(stdout, "\33[%sm\33[K", color);
 
-                               fwrite(line->dat + matches[i].rm_so, 
-                                   matches[i].rm_eo - matches[i].rm_so, 1,
-                                   stdout);
+                       fwrite(line->dat + matches[i].rm_so, 
+                           matches[i].rm_eo - matches[i].rm_so, 1,
+                           stdout);
+
                        if (color) 
                                fprintf(stdout, "\33[m\33[K");
                        a = matches[i].rm_eo;