[src/trunk]: src/sys/kern KNF

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

details:   https://anonhg.NetBSD.org/src/rev/3ae7c4d86d8e
branches:  trunk
changeset: 337722:3ae7c4d86d8e
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Apr 25 08:19:06 2015 +0000

description:
KNF

diffstat:

 sys/kern/kern_veriexec.c |  29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diffs (137 lines):

diff -r 24e5826f5bdb -r 3ae7c4d86d8e sys/kern/kern_veriexec.c
--- a/sys/kern/kern_veriexec.c  Sat Apr 25 02:41:42 2015 +0000
+++ b/sys/kern/kern_veriexec.c  Sat Apr 25 08:19:06 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_veriexec.c,v 1.1 2015/02/13 17:50:48 maxv Exp $   */
+/*     $NetBSD: kern_veriexec.c,v 1.2 2015/04/25 08:19:06 maxv Exp $   */
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad%NetBSD.org@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.1 2015/02/13 17:50:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.2 2015/04/25 08:19:06 maxv Exp $");
 
 #include "opt_veriexec.h"
 
@@ -713,7 +713,7 @@
                return (0);
        }
 
-        switch (vfe->status) {
+       switch (vfe->status) {
        case FINGERPRINT_NOTEVAL:
                /* Should not happen. */
                rw_exit(&vfe->lock);
@@ -722,8 +722,7 @@
                veriexec_file_report(vfe, "Not-evaluated status "
                    "post evaluation; inconsistency detected.", name,
                    NULL, REPORT_ALWAYS|REPORT_PANIC);
-
-               /*NOTREACHED*/
+               /* NOTREACHED */
 
        case FINGERPRINT_VALID:
                /* Valid fingerprint. */
@@ -752,7 +751,8 @@
                        rw_exit(&veriexec_op_lock);
                veriexec_file_report(vfe, "Invalid status "
                    "post evaluation.", name, NULL, REPORT_ALWAYS|REPORT_PANIC);
-        }
+               /* NOTREACHED */
+       }
 
        if (lockstate == VERIEXEC_UNLOCKED)
                rw_exit(&veriexec_op_lock);
@@ -889,7 +889,6 @@
        else
                error = veriexec_file_delete(l, vp);
 
-
        return error;
 }
 
@@ -1029,7 +1028,6 @@
 void
 veriexec_purge(struct vnode *vp)
 {
-
        rw_enter(&veriexec_op_lock, RW_READER);
        veriexec_file_purge(veriexec_get(vp), VERIEXEC_UNLOCKED);
        rw_exit(&veriexec_op_lock);
@@ -1201,14 +1199,11 @@
        if (vp->v_type != VREG) {
                log(LOG_ERR, "Veriexec: Not adding `%s': Not a regular file.\n",
                    file);
-
                error = EBADF;
-
                goto out;
        }
 
        vfe = kmem_zalloc(sizeof(*vfe), KM_SLEEP);
-
        rw_init(&vfe->lock);
 
        /* Lookup fingerprint hashing algorithm. */
@@ -1217,9 +1212,7 @@
        if ((vfe->ops = veriexec_fpops_lookup(fp_type)) == NULL) {
                log(LOG_ERR, "Veriexec: Invalid or unknown fingerprint type "
                    "`%s' for file `%s'.\n", fp_type, file);
-
                error = EOPNOTSUPP;
-
                goto out;
        }
 
@@ -1227,9 +1220,7 @@
            vfe->ops->hash_len) {
                log(LOG_ERR, "Veriexec: Bad fingerprint length for `%s'.\n",
                    file);
-
                error = EINVAL;
-
                goto out;
        }
 
@@ -1253,16 +1244,16 @@
                else
                        fp_mismatch = false;
 
-               if ((veriexec_verbose >= 1) || fp_mismatch)
+               if ((veriexec_verbose >= 1) || fp_mismatch) {
                        log(LOG_NOTICE, "Veriexec: Duplicate entry for `%s' "
                            "ignored. (%s fingerprint)\n", file,
                            fp_mismatch ? "different" : "same");
+               }
 
                veriexec_file_free(vfe);
 
                /* XXX Should this be EEXIST if fp_mismatch is true? */
                error = 0;
-
                goto unlock_out;
        }
 
@@ -1277,9 +1268,7 @@
                if (extra_flags) {
                        log(LOG_NOTICE, "Veriexec: Contaminated flags `0x%x' "
                            "for `%s', skipping.\n", extra_flags, file);
-
                        error = EINVAL;
-
                        goto unlock_out;
                }
        }
@@ -1411,8 +1400,8 @@
 
        rw_enter(&vfe->lock, RW_READER);
        veriexec_file_convert(vfe, rdict);
+       rw_exit(&vfe->lock);
 
-       rw_exit(&vfe->lock);
        rw_exit(&veriexec_op_lock);
        return (0);
 }