Module Name: src
Committed By: dholland
Date: Sun Jan 29 19:36:15 UTC 2012
Modified Files:
src/sys/sys: quota.h quotactl.h
Log Message:
Move the semantic restriction codes from sys/quotactl.h to
sys/quota.h; they're meant to be used by applications and were
stuffed into the wrong place by accident last week and got
committed that way yesterday.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/sys/quota.h
cvs rdiff -u -r1.30 -r1.31 src/sys/sys/quotactl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/quota.h
diff -u src/sys/sys/quota.h:1.10 src/sys/sys/quota.h:1.11
--- src/sys/sys/quota.h:1.10 Sun Jan 29 06:43:34 2012
+++ src/sys/sys/quota.h Sun Jan 29 19:36:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.10 2012/01/29 06:43:34 dholland Exp $ */
+/* $NetBSD: quota.h,v 1.11 2012/01/29 19:36:14 dholland Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -47,6 +47,15 @@
/* time value for "no time" */
#define QUOTA_NOTIME ((time_t)-1)
+/*
+ * Semantic restrictions. These are hints applications can use
+ * to help produce comprehensible error diagnostics when something
+ * unsupported is attempted.
+ */
+#define QUOTA_RESTRICT_NEEDSQUOTACHECK 0x1 /* quotacheck(8) required */
+#define QUOTA_RESTRICT_UNIFORMGRACE 0x2 /* grace time is global */
+#define QUOTA_RESTRICT_32BIT 0x4 /* values limited to 2^32 */
+
/*
* Structure used to describe the key part of a quota record.
Index: src/sys/sys/quotactl.h
diff -u src/sys/sys/quotactl.h:1.30 src/sys/sys/quotactl.h:1.31
--- src/sys/sys/quotactl.h:1.30 Sun Jan 29 07:13:43 2012
+++ src/sys/sys/quotactl.h Sun Jan 29 19:36:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quotactl.h,v 1.30 2012/01/29 07:13:43 dholland Exp $ */
+/* $NetBSD: quotactl.h,v 1.31 2012/01/29 19:36:14 dholland Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,13 +40,6 @@
/* Size of random quota strings */
#define QUOTA_NAMELEN 32
-/*
- * Restrictions for qs_restrictions.
- */
-#define QUOTA_RESTRICT_NEEDSQUOTACHECK 0x1 /* quotacheck(8) required */
-#define QUOTA_RESTRICT_UNIFORMGRACE 0x2 /* grace time is global */
-#define QUOTA_RESTRICT_32BIT 0x4 /* values limited to 2^32 */
-
/*
* Structure for QUOTACTL_STAT.
*/
@@ -54,7 +47,7 @@ struct quotastat {
char qs_implname[QUOTA_NAMELEN];
unsigned qs_numidtypes;
unsigned qs_numobjtypes;
- unsigned qs_restrictions;
+ unsigned qs_restrictions; /* semantic restriction codes */
};
/*
