[src/trunk]: src/sys/ufs/ufs Move INITQFNAMES to the right header file.

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

details:   https://anonhg.NetBSD.org/src/rev/126847335ff2
branches:  trunk
changeset: 781194:126847335ff2
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 26 02:32:14 2012 +0000

description:
Move INITQFNAMES to the right header file.

diffstat:

 sys/ufs/ufs/quota.h     |  10 +++++++++-
 sys/ufs/ufs/quota1.h    |  10 +---------
 sys/ufs/ufs/ufs_quota.c |   5 ++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r 5d5751a3cc8e -r 126847335ff2 sys/ufs/ufs/quota.h
--- a/sys/ufs/ufs/quota.h       Sun Aug 26 02:32:00 2012 +0000
+++ b/sys/ufs/ufs/quota.h       Sun Aug 26 02:32:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quota.h,v 1.29 2012/01/29 07:16:00 dholland Exp $      */
+/*     $NetBSD: quota.h,v 1.30 2012/08/26 02:32:14 dholland Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -53,6 +53,14 @@
 #define        USRQUOTA        0       /* element used for user quotas */
 #define        GRPQUOTA        1       /* element used for group quotas */
 
+/*
+ * Initializer for the strings corresponding to the quota ID types.
+ * (in quota1 these are also the default names of the quota files)
+ */
+#define INITQFNAMES { \
+       "user",         /* USRQUOTA */ \
+       "group",        /* GRPQUOTA */ \
+}
 
 #if !defined(HAVE_NBTOOL_CONFIG_H)
 #include <sys/quota.h>
diff -r 5d5751a3cc8e -r 126847335ff2 sys/ufs/ufs/quota1.h
--- a/sys/ufs/ufs/quota1.h      Sun Aug 26 02:32:00 2012 +0000
+++ b/sys/ufs/ufs/quota1.h      Sun Aug 26 02:32:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quota1.h,v 1.6 2012/01/29 06:23:20 dholland Exp $      */
+/*     $NetBSD: quota1.h,v 1.7 2012/08/26 02:32:14 dholland Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -47,14 +47,6 @@
  */
 
 /*
- * Definitions for the default names of the quotas files/quota types.
- */
-#define INITQFNAMES { \
-       "user",         /* USRQUOTA */ \
-       "group",        /* GRPQUOTA */ \
-}
-
-/*
  * Definitions for disk quotas imposed on the average user
  * (big brother finally hits UNIX).
  *
diff -r 5d5751a3cc8e -r 126847335ff2 sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c   Sun Aug 26 02:32:00 2012 +0000
+++ b/sys/ufs/ufs/ufs_quota.c   Sun Aug 26 02:32:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland Exp $ */
+/*     $NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 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.110 2012/07/29 08:32:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -52,7 +52,6 @@
 
 #include <sys/quotactl.h>
 #include <ufs/ufs/quota.h>
-#include <ufs/ufs/quota1.h> /* for INITQFNAMES; should be moved to quota.h */
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>