Module Name:    src
Committed By:   joerg
Date:           Thu Jun 12 21:39:45 UTC 2014

Modified Files:
        src/lib/libquota: quota_kernel.c
        src/sys/compat/netbsd32: netbsd32_netbsd.c
        src/sys/kern: vfs_quotactl.c vfs_syscalls.c
        src/sys/sys: quotactl.h
        src/sys/ufs/lfs: ulfs_quota.c
        src/sys/ufs/ufs: ufs_quota.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libquota/quota_kernel.c
cvs rdiff -u -r1.187 -r1.188 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/vfs_quotactl.c
cvs rdiff -u -r1.482 -r1.483 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.36 -r1.37 src/sys/sys/quotactl.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/lfs/ulfs_quota.c
cvs rdiff -u -r1.115 -r1.116 src/sys/ufs/ufs/ufs_quota.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libquota/quota_kernel.c
diff -u src/lib/libquota/quota_kernel.c:1.4 src/lib/libquota/quota_kernel.c:1.5
--- src/lib/libquota/quota_kernel.c:1.4	Wed Feb  1 06:19:05 2012
+++ src/lib/libquota/quota_kernel.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ __quota_kernel_delete(struct quotahandle
 	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);
 }
 

Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.187 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.188
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.187	Thu May 15 18:25:35 2014
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ netbsd32___quotactl(struct lwp *l, const
 		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 =

Index: src/sys/kern/vfs_quotactl.c
diff -u src/sys/kern/vfs_quotactl.c:1.38 src/sys/kern/vfs_quotactl.c:1.39
--- src/sys/kern/vfs_quotactl.c:1.38	Wed Feb  1 05:43:54 2012
+++ src/sys/kern/vfs_quotactl.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ vfs_quotactl_delete(struct mount *mp, co
 	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);
 }
 

Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.482 src/sys/kern/vfs_syscalls.c:1.483
--- src/sys/kern/vfs_syscalls.c:1.482	Sun Apr 20 21:26:51 2014
+++ src/sys/kern/vfs_syscalls.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ do_sys_quotactl(const char *path_u, cons
 				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,

Index: src/sys/sys/quotactl.h
diff -u src/sys/sys/quotactl.h:1.36 src/sys/sys/quotactl.h:1.37
--- src/sys/sys/quotactl.h:1.36	Sat Dec  1 11:41:50 2012
+++ src/sys/sys/quotactl.h	Thu Jun 12 21:39:45 2014
@@ -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 @@ struct quotactl_args {
 		} put;
 		struct {
 			const struct quotakey *qc_key;
-		} delete;
+		} remove;
 		struct {
 			struct quotakcursor *qc_cursor;
 		} cursoropen;

Index: src/sys/ufs/lfs/ulfs_quota.c
diff -u src/sys/ufs/lfs/ulfs_quota.c:1.10 src/sys/ufs/lfs/ulfs_quota.c:1.11
--- src/sys/ufs/lfs/ulfs_quota.c:1.10	Fri Nov 22 02:02:35 2013
+++ src/sys/ufs/lfs/ulfs_quota.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ quota_handle_cmd_delete(struct mount *mp
 	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) {

Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.115 src/sys/ufs/ufs/ufs_quota.c:1.116
--- src/sys/ufs/ufs/ufs_quota.c:1.115	Sat Nov 16 17:04:53 2013
+++ src/sys/ufs/ufs/ufs_quota.c	Thu Jun 12 21:39:45 2014
@@ -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 @@ quota_handle_cmd_delete(struct mount *mp
 	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) {

Reply via email to