summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2014-06-28 22:27:50 +0000
committerdholland <dholland@NetBSD.org>2014-06-28 22:27:50 +0000
commit30cc8b980f277a5029435ba4bf993baf3fde14bc (patch)
tree40d338607bcc17500e58b1f8f66bd4e3f004f47a /lib
parent953c3dc468225ba33fa76a01ecc000963fed4cb7 (diff)
Revert the following changes:
src/sys/sys/quotactl.h 1.37 src/sys/compat/netbsd32/netbsd32.h 1.101 src/sys/compat/netbsd32/netbsd32_netbsd.c 1.188, 1.189 src/sys/kern/vfs_quotactl.c 1.39 src/sys/kern/vfs_syscalls.c 1.483 src/sys/ufs/lfs/ulfs_quota.c 1.11 src/sys/ufs/ufs/ufs_quota.c 1.116 src/lib/libquota/quota_kernel.c 1.5 and do them correctly. If you're going to change the name of something, you need to change the name of *all* the things with the same name, not just a handful, and you should change it to something similar so it still matches the rest of the system rather than just picking an arbitrarily different name. Hi, Joerg. To wit, rename the quotactl "delete" operation to "del", because "delete" is a reserved word in C++ and for some reason Joerg wants to run internal interfaces used only by C code through his C++ compiler. Do not rename it to "remove" instead, because this doesn't match libquota or the rest of the usage throughout the system; and rename all the related identifiers, not just the ones that blew the mind of Joerg's C++ compiler. Because this is not a user-facing API (the only userland consumer sys/quotactl.h is libquota) it is sort of ok to make arbitrary source-incompatible changes; however, by the same token it's completely unnecessary. If it *were* a user-facing API that someone might have a semi-rational reason to want to run a C++ compiler on, it would be incorrect to change it at this point.
Diffstat (limited to 'lib')
-rw-r--r--lib/libquota/quota_kernel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libquota/quota_kernel.c b/lib/libquota/quota_kernel.c
index 20b7033a8e0..0a5a8bcda02 100644
--- a/lib/libquota/quota_kernel.c
+++ b/lib/libquota/quota_kernel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_kernel.c,v 1.5 2014/06/12 21:39:45 joerg Exp $ */
+/* $NetBSD: quota_kernel.c,v 1.6 2014/06/28 22:27:50 dholland 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.5 2014/06/12 21:39:45 joerg Exp $");
+__RCSID("$NetBSD: quota_kernel.c,v 1.6 2014/06/28 22:27:50 dholland Exp $");
#include <stdlib.h>
#include <err.h>
@@ -220,8 +220,8 @@ __quota_kernel_delete(struct quotahandle *qh, const struct quotakey *qk)
{
struct quotactl_args args;
- args.qc_op = QUOTACTL_DELETE;
- args.u.remove.qc_key = qk;
+ args.qc_op = QUOTACTL_DEL;
+ args.u.del.qc_key = qk;
return __quotactl(qh->qh_mountpoint, &args);
}