Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/obio name the flag ioctl argument "flag" lik...



details:   https://anonhg.NetBSD.org/src/rev/6fc9d2bbe33c
branches:  trunk
changeset: 335296:6fc9d2bbe33c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 02 15:49:51 2015 +0000

description:
name the flag ioctl argument "flag" like most other drivers.

diffstat:

 sys/arch/mac68k/obio/iwm_fd.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r d7ebbbf9cb3f -r 6fc9d2bbe33c sys/arch/mac68k/obio/iwm_fd.c
--- a/sys/arch/mac68k/obio/iwm_fd.c     Fri Jan 02 11:46:53 2015 +0000
+++ b/sys/arch/mac68k/obio/iwm_fd.c     Fri Jan 02 15:49:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $     */
+/*     $NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $     */
 
 /*
  * Copyright (c) 1997, 1998 Hauke Fath.  All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $");
 
 #include "locators.h"
 
@@ -698,7 +698,7 @@
  * we do not support them.
  */
 int
-fdioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
+fdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 {
        int result, fdUnit, fdType;
        fd_softc_t *fd;
@@ -729,7 +729,7 @@
        case DIOCSDINFO:
                if (TRACE_IOCTL)
                        printf(" DIOCSDINFO: Set in-core disklabel.\n");
-               result = ((flags & FWRITE) == 0) ? EBADF : 0;
+               result = ((flag & FWRITE) == 0) ? EBADF : 0;
                if (result == 0)
                        result = setdisklabel(fd->diskInfo.dk_label,
                            (struct disklabel *)data, 0,
@@ -740,7 +740,7 @@
                if (TRACE_IOCTL)
                        printf(" DIOCWDINFO: Set in-core disklabel "
                            "& update disk.\n");
-               result = ((flags & FWRITE) == 0) ? EBADF : 0;
+               result = ((flag & FWRITE) == 0) ? EBADF : 0;
 
                if (result == 0)
                        result = setdisklabel(fd->diskInfo.dk_label,
@@ -779,7 +779,7 @@
        case DIOCWLABEL:
                if (TRACE_IOCTL)
                        printf(" DIOCWLABEL: Set write access to disklabel.\n");
-               result = ((flags & FWRITE) == 0) ? EBADF : 0;
+               result = ((flag & FWRITE) == 0) ? EBADF : 0;
 
                if (result == 0)
                        fd->writeLabel = *(int *)data;



Home | Main Index | Thread Index | Old Index