[src/trunk]: src Don't t use a C++ keyword as field name.

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

details:   https://anonhg.NetBSD.org/src/rev/172fcda83da7
branches:  trunk
changeset: 329880:172fcda83da7
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Jun 12 21:39:45 2014 +0000

description:
Don't t use a C++ keyword as field name.

diffstat:

 lib/libquota/quota_kernel.c           |  6 +++---
 sys/compat/netbsd32/netbsd32_netbsd.c |  6 +++---
 sys/kern/vfs_quotactl.c               |  6 +++---
 sys/kern/vfs_syscalls.c               |  6 +++---
 sys/sys/quotactl.h                    |  4 ++--
 sys/ufs/lfs/ulfs_quota.c              |  6 +++---
 sys/ufs/ufs/ufs_quota.c               |  6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diffs (180 lines):

diff -r 3738fd09e846 -r 172fcda83da7 lib/libquota/quota_kernel.c
--- a/lib/libquota/quota_kernel.c       Thu Jun 12 21:08:31 2014 +0000
+++ b/lib/libquota/quota_kernel.c       Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quota_kernel.c,v 1.4 2012/02/01 06:19:05 dholland Exp $        */
+/*     $NetBSD: quota_kernel.c,v 1.5 2014/06/12 21:39:45 joerg Exp $   */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: quota_kernel.c,v 1.4 2012/02/01 06:19:05 dholland Exp $");
+__RCSID("$NetBSD: quota_kernel.c,v 1.5 2014/06/12 21:39:45 joerg Exp $");
 
 #include <stdlib.h>
 #include <err.h>
@@ -221,7 +221,7 @@
        struct quotactl_args args;
 
        args.qc_op = QUOTACTL_DELETE;
-       args.u.delete.qc_key = qk;
+       args.u.remove.qc_key = qk;
        return __quotactl(qh->qh_mountpoint, &args);
 }
 
diff -r 3738fd09e846 -r 172fcda83da7 sys/compat/netbsd32/netbsd32_netbsd.c
--- a/sys/compat/netbsd32/netbsd32_netbsd.c     Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c     Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_netbsd.c,v 1.187 2014/05/15 18:25:35 manu Exp $       */
+/*     $NetBSD: netbsd32_netbsd.c,v 1.188 2014/06/12 21:39:45 joerg Exp $      */
 
 /*
  * Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.187 2014/05/15 18:25:35 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.188 2014/06/12 21:39:45 joerg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -1236,7 +1236,7 @@
                args.u.put.qc_val = NETBSD32PTR64(args32.u.put.qc_val);
                break;
            case QUOTACTL_DELETE:
-               args.u.delete.qc_key = NETBSD32PTR64(args32.u.delete.qc_key);
+               args.u.remove.qc_key = NETBSD32PTR64(args32.u.delete.qc_key);
                break;
            case QUOTACTL_CURSOROPEN:
                args.u.cursoropen.qc_cursor =
diff -r 3738fd09e846 -r 172fcda83da7 sys/kern/vfs_quotactl.c
--- a/sys/kern/vfs_quotactl.c   Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/kern/vfs_quotactl.c   Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland Exp $       */
+/*     $NetBSD: vfs_quotactl.c,v 1.39 2014/06/12 21:39:45 joerg Exp $  */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.39 2014/06/12 21:39:45 joerg Exp $$");
 
 #include <sys/mount.h>
 #include <sys/quotactl.h>
@@ -98,7 +98,7 @@
        struct quotactl_args args;
 
        args.qc_op = QUOTACTL_DELETE;
-       args.u.delete.qc_key = key;
+       args.u.remove.qc_key = key;
        return VFS_QUOTACTL(mp, &args);
 }
 
diff -r 3738fd09e846 -r 172fcda83da7 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c   Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/kern/vfs_syscalls.c   Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_syscalls.c,v 1.482 2014/04/20 21:26:51 maxv Exp $  */
+/*     $NetBSD: vfs_syscalls.c,v 1.483 2014/06/12 21:39:45 joerg Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.482 2014/04/20 21:26:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.483 2014/06/12 21:39:45 joerg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
@@ -1004,7 +1004,7 @@
                                args->u.put.qc_val);
                break;
            case QUOTACTL_DELETE:
-               error = do_sys_quotactl_delete(mp, args->u.delete.qc_key);
+               error = do_sys_quotactl_delete(mp, args->u.remove.qc_key);
                break;
            case QUOTACTL_CURSOROPEN:
                error = do_sys_quotactl_cursoropen(mp,
diff -r 3738fd09e846 -r 172fcda83da7 sys/sys/quotactl.h
--- a/sys/sys/quotactl.h        Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/sys/quotactl.h        Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quotactl.h,v 1.36 2012/12/01 11:41:50 mbalmer Exp $    */
+/*     $NetBSD: quotactl.h,v 1.37 2014/06/12 21:39:45 joerg Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -118,7 +118,7 @@
                } put;
                struct {
                        const struct quotakey *qc_key;
-               } delete;
+               } remove;
                struct {
                        struct quotakcursor *qc_cursor;
                } cursoropen;
diff -r 3738fd09e846 -r 172fcda83da7 sys/ufs/lfs/ulfs_quota.c
--- a/sys/ufs/lfs/ulfs_quota.c  Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/ufs/lfs/ulfs_quota.c  Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_quota.c,v 1.10 2013/11/22 02:02:35 dholland Exp $ */
+/*     $NetBSD: ulfs_quota.c,v 1.11 2014/06/12 21:39:45 joerg Exp $    */
 /*  from NetBSD: ufs_quota.c,v 1.115 2013/11/16 17:04:53 dholland Exp  */
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.10 2013/11/22 02:02:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.11 2014/06/12 21:39:45 joerg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -443,7 +443,7 @@
        int error;
 
        KASSERT(args->qc_op == QUOTACTL_DELETE);
-       qk = args->u.delete.qc_key;
+       qk = args->u.remove.qc_key;
 
        kauth_id = qk->qk_id;
        if (kauth_id == QUOTA_DEFAULTID) {
diff -r 3738fd09e846 -r 172fcda83da7 sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c   Thu Jun 12 21:08:31 2014 +0000
+++ b/sys/ufs/ufs/ufs_quota.c   Thu Jun 12 21:39:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_quota.c,v 1.115 2013/11/16 17:04:53 dholland Exp $ */
+/*     $NetBSD: ufs_quota.c,v 1.116 2014/06/12 21:39:45 joerg Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.115 2013/11/16 17:04:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.116 2014/06/12 21:39:45 joerg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -436,7 +436,7 @@
        int error;
 
        KASSERT(args->qc_op == QUOTACTL_DELETE);
-       qk = args->u.delete.qc_key;
+       qk = args->u.remove.qc_key;
 
        kauth_id = qk->qk_id;
        if (kauth_id == QUOTA_DEFAULTID) {