Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Improve the names of some members of struct quotactl_args. T...
details: https://anonhg.NetBSD.org/src/rev/cf549d844084
branches: trunk
changeset: 773383:cf549d844084
user: dholland <dholland%NetBSD.org@localhost>
date: Wed Feb 01 05:43:53 2012 +0000
description:
Improve the names of some members of struct quotactl_args. These are
effectively function parameter names, but since they need to be
described with the same names in the man page the choices do matter.
Some.
diffstat:
lib/libquota/quota_kernel.c | 8 +++---
sys/compat/netbsd32/netbsd32.h | 6 ++--
sys/compat/netbsd32/netbsd32_netbsd.c | 8 +++---
sys/kern/vfs_quotactl.c | 8 +++---
sys/kern/vfs_syscalls.c | 8 +++---
sys/sys/quotactl.h | 6 ++--
sys/ufs/ufs/ufs_quota.c | 38 +++++++++++++++++-----------------
sys/ufs/ufs/ufs_quota1.c | 10 ++++----
sys/ufs/ufs/ufs_quota2.c | 10 ++++----
9 files changed, 51 insertions(+), 51 deletions(-)
diffs (truncated from 371 to 300 lines):
diff -r 52f5f60b05a4 -r cf549d844084 lib/libquota/quota_kernel.c
--- a/lib/libquota/quota_kernel.c Wed Feb 01 05:42:17 2012 +0000
+++ b/lib/libquota/quota_kernel.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_kernel.c,v 1.1 2012/02/01 05:34:40 dholland Exp $ */
+/* $NetBSD: quota_kernel.c,v 1.2 2012/02/01 05:43:53 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.1 2012/02/01 05:34:40 dholland Exp $");
+__RCSID("$NetBSD: quota_kernel.c,v 1.2 2012/02/01 05:43:53 dholland Exp $");
#include <stdlib.h>
#include <err.h>
@@ -52,7 +52,7 @@
struct quotactl_args args;
args.qc_op = QUOTACTL_STAT;
- args.u.stat.qc_ret = stat;
+ args.u.stat.qc_info = stat;
return __quotactl(qh->qh_mountpoint, &args);
}
@@ -199,7 +199,7 @@
args.qc_op = QUOTACTL_GET;
args.u.get.qc_key = qk;
- args.u.get.qc_ret = qv;
+ args.u.get.qc_val = qv;
return __quotactl(qh->qh_mountpoint, &args);
}
diff -r 52f5f60b05a4 -r cf549d844084 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/compat/netbsd32/netbsd32.h Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.90 2012/02/01 05:40:00 dholland Exp $ */
+/* $NetBSD: netbsd32.h,v 1.91 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -274,7 +274,7 @@
unsigned qc_op;
union {
struct {
- netbsd32_pointer_t qc_ret;
+ netbsd32_pointer_t qc_info;
} stat;
struct {
int qc_idtype;
@@ -286,7 +286,7 @@
} objtypestat;
struct {
netbsd32_pointer_t qc_key;
- netbsd32_pointer_t qc_ret;
+ netbsd32_pointer_t qc_val;
} get;
struct {
netbsd32_pointer_t qc_key;
diff -r 52f5f60b05a4 -r cf549d844084 sys/compat/netbsd32/netbsd32_netbsd.c
--- a/sys/compat/netbsd32/netbsd32_netbsd.c Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.178 2012/02/01 05:40:00 dholland Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland 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.178 2012/02/01 05:40:00 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1204,7 +1204,7 @@
args.qc_op = args32.qc_op;
switch (args.qc_op) {
case QUOTACTL_STAT:
- args.u.stat.qc_ret = NETBSD32PTR64(args32.u.stat.qc_ret);
+ args.u.stat.qc_info = NETBSD32PTR64(args32.u.stat.qc_info);
break;
case QUOTACTL_IDTYPESTAT:
args.u.idtypestat.qc_idtype = args32.u.idtypestat.qc_idtype;
@@ -1219,7 +1219,7 @@
break;
case QUOTACTL_GET:
args.u.get.qc_key = NETBSD32PTR64(args32.u.get.qc_key);
- args.u.get.qc_ret = NETBSD32PTR64(args32.u.get.qc_ret);
+ args.u.get.qc_val = NETBSD32PTR64(args32.u.get.qc_val);
break;
case QUOTACTL_PUT:
args.u.put.qc_key = NETBSD32PTR64(args32.u.put.qc_key);
diff -r 52f5f60b05a4 -r cf549d844084 sys/kern/vfs_quotactl.c
--- a/sys/kern/vfs_quotactl.c Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/kern/vfs_quotactl.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_quotactl.c,v 1.37 2012/02/01 05:34:41 dholland Exp $ */
+/* $NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland 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.37 2012/02/01 05:34:41 dholland Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland Exp $$");
#include <sys/mount.h>
#include <sys/quotactl.h>
@@ -40,7 +40,7 @@
struct quotactl_args args;
args.qc_op = QUOTACTL_STAT;
- args.u.stat.qc_ret = info;
+ args.u.stat.qc_info = info;
return VFS_QUOTACTL(mp, &args);
}
@@ -76,7 +76,7 @@
args.qc_op = QUOTACTL_GET;
args.u.get.qc_key = key;
- args.u.get.qc_ret = val;
+ args.u.get.qc_val = val;
return VFS_QUOTACTL(mp, &args);
}
diff -r 52f5f60b05a4 -r cf549d844084 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/kern/vfs_syscalls.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.445 2012/02/01 05:39:28 dholland Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.446 2012/02/01 05:43:54 dholland 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.445 2012/02/01 05:39:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.446 2012/02/01 05:43:54 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -921,7 +921,7 @@
switch (args->qc_op) {
case QUOTACTL_STAT:
- error = do_sys_quotactl_stat(mp, args->u.stat.qc_ret);
+ error = do_sys_quotactl_stat(mp, args->u.stat.qc_info);
break;
case QUOTACTL_IDTYPESTAT:
error = do_sys_quotactl_idtypestat(mp,
@@ -936,7 +936,7 @@
case QUOTACTL_GET:
error = do_sys_quotactl_get(mp,
args->u.get.qc_key,
- args->u.get.qc_ret);
+ args->u.get.qc_val);
break;
case QUOTACTL_PUT:
error = do_sys_quotactl_put(mp,
diff -r 52f5f60b05a4 -r cf549d844084 sys/sys/quotactl.h
--- a/sys/sys/quotactl.h Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/sys/quotactl.h Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: quotactl.h,v 1.33 2012/02/01 05:34:42 dholland Exp $ */
+/* $NetBSD: quotactl.h,v 1.34 2012/02/01 05:43:54 dholland Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -98,7 +98,7 @@
unsigned qc_op;
union {
struct {
- struct quotastat *qc_ret;
+ struct quotastat *qc_info;
} stat;
struct {
int qc_idtype;
@@ -110,7 +110,7 @@
} objtypestat;
struct {
const struct quotakey *qc_key;
- struct quotaval *qc_ret;
+ struct quotaval *qc_val;
} get;
struct {
const struct quotakey *qc_key;
diff -r 52f5f60b05a4 -r cf549d844084 sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.107 2012/02/01 05:34:43 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.108 2012/02/01 05:43:54 dholland 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.107 2012/02/01 05:34:43 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.108 2012/02/01 05:43:54 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -227,32 +227,32 @@
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
- struct quotastat *ret;
+ struct quotastat *info;
KASSERT(args->qc_op == QUOTACTL_STAT);
- ret = args->u.stat.qc_ret;
+ info = args->u.stat.qc_info;
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
#ifdef QUOTA
if (ump->um_flags & UFS_QUOTA) {
- strcpy(ret->qs_implname, "ufs/ffs quota v1");
- ret->qs_numidtypes = MAXQUOTAS;
+ strcpy(info->qs_implname, "ufs/ffs quota v1");
+ info->qs_numidtypes = MAXQUOTAS;
/* XXX no define for this */
- ret->qs_numobjtypes = 2;
- ret->qs_restrictions = 0;
- ret->qs_restrictions |= QUOTA_RESTRICT_NEEDSQUOTACHECK;
- ret->qs_restrictions |= QUOTA_RESTRICT_UNIFORMGRACE;
- ret->qs_restrictions |= QUOTA_RESTRICT_32BIT;
+ info->qs_numobjtypes = 2;
+ info->qs_restrictions = 0;
+ info->qs_restrictions |= QUOTA_RESTRICT_NEEDSQUOTACHECK;
+ info->qs_restrictions |= QUOTA_RESTRICT_UNIFORMGRACE;
+ info->qs_restrictions |= QUOTA_RESTRICT_32BIT;
} else
#endif
#ifdef QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
- strcpy(ret->qs_implname, "ufs/ffs quota v2");
- ret->qs_numidtypes = MAXQUOTAS;
- ret->qs_numobjtypes = N_QL;
- ret->qs_restrictions = 0;
+ strcpy(info->qs_implname, "ufs/ffs quota v2");
+ info->qs_numidtypes = MAXQUOTAS;
+ info->qs_numobjtypes = N_QL;
+ info->qs_restrictions = 0;
} else
#endif
return EOPNOTSUPP;
@@ -347,11 +347,11 @@
struct ufsmount *ump = VFSTOUFS(mp);
int error;
const struct quotakey *qk;
- struct quotaval *ret;
+ struct quotaval *qv;
KASSERT(args->qc_op == QUOTACTL_GET);
qk = args->u.get.qc_key;
- ret = args->u.get.qc_ret;
+ qv = args->u.get.qc_val;
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
@@ -361,12 +361,12 @@
return error;
#ifdef QUOTA
if (ump->um_flags & UFS_QUOTA) {
- error = quota1_handle_cmd_get(ump, qk, ret);
+ error = quota1_handle_cmd_get(ump, qk, qv);
} else
#endif
#ifdef QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
- error = quota2_handle_cmd_get(ump, qk, ret);
+ error = quota2_handle_cmd_get(ump, qk, qv);
} else
#endif
panic("quota_handle_cmd_get: no support ?");
diff -r 52f5f60b05a4 -r cf549d844084 sys/ufs/ufs/ufs_quota1.c
--- a/sys/ufs/ufs/ufs_quota1.c Wed Feb 01 05:42:17 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota1.c Wed Feb 01 05:43:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.16 2012/01/29 07:16:53 dholland Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.17 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
Home |
Main Index |
Thread Index |
Old Index