[src/bouyer-quota2]: src/usr.sbin/repquota Use quota1_subr.c

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

details:   https://anonhg.NetBSD.org/src/rev/7726fece2b9f
branches:  bouyer-quota2
changeset: 761078:7726fece2b9f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Jan 29 11:04:43 2011 +0000

description:
Use quota1_subr.c

diffstat:

 usr.sbin/repquota/Makefile   |   4 ++--
 usr.sbin/repquota/repquota.c |  16 +---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (48 lines):

diff -r a12268445506 -r 7726fece2b9f usr.sbin/repquota/Makefile
--- a/usr.sbin/repquota/Makefile        Fri Jan 28 23:31:16 2011 +0000
+++ b/usr.sbin/repquota/Makefile        Sat Jan 29 11:04:43 2011 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
-#      $NetBSD: Makefile,v 1.5.64.1 2011/01/21 16:58:06 bouyer Exp $
+#      $NetBSD: Makefile,v 1.5.64.2 2011/01/29 11:04:43 bouyer Exp $
 
 .include <bsd.own.mk>
 PROG=  repquota
@@ -13,6 +13,6 @@
 .PATH: ${NETBSDSRCDIR}/usr.bin/quota
 SRCS+= printquota.c
 .PATH: ${NETBSDSRCDIR}/sys/ufs/ufs 
-SRCS+= quota2_prop.c
+SRCS+= quota2_prop.c quota1_subr.c
 
 .include <bsd.prog.mk>
diff -r a12268445506 -r 7726fece2b9f usr.sbin/repquota/repquota.c
--- a/usr.sbin/repquota/repquota.c      Fri Jan 28 23:31:16 2011 +0000
+++ b/usr.sbin/repquota/repquota.c      Sat Jan 29 11:04:43 2011 +0000
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94";
 #else
-__RCSID("$NetBSD: repquota.c,v 1.25.2.1 2011/01/21 16:58:07 bouyer Exp $");
+__RCSID("$NetBSD: repquota.c,v 1.25.2.2 2011/01/29 11:04:43 bouyer Exp $");
 #endif
 #endif /* not lint */
 
@@ -526,17 +526,3 @@
        }
        return (fup);
 }
-
-void
-dqblk2q2e(const struct dqblk *dqblk, struct quota2_entry *q2e)
-{ 
-       q2e->q2e_val[Q2V_BLOCK].q2v_hardlimit = dqblk->dqb_bhardlimit;  
-       q2e->q2e_val[Q2V_BLOCK].q2v_softlimit = dqblk->dqb_bsoftlimit; 
-       q2e->q2e_val[Q2V_BLOCK].q2v_cur       = dqblk->dqb_curblocks;
-       q2e->q2e_val[Q2V_BLOCK].q2v_time      = dqblk->dqb_btime;
-  
-       q2e->q2e_val[Q2V_FILE].q2v_hardlimit = dqblk->dqb_ihardlimit;
-       q2e->q2e_val[Q2V_FILE].q2v_softlimit = dqblk->dqb_isoftlimit;
-       q2e->q2e_val[Q2V_FILE].q2v_cur       = dqblk->dqb_curinodes;
-       q2e->q2e_val[Q2V_FILE].q2v_time      = dqblk->dqb_itime;
-}