Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/quota Remove leftover #if 0 code from before the lib...



details:   https://anonhg.NetBSD.org/src/rev/4b475372d743
branches:  trunk
changeset: 330522:4b475372d743
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jul 13 01:46:04 2014 +0000

description:
Remove leftover #if 0 code from before the libquota rework.

diffstat:

 usr.bin/quota/quota.c |  29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diffs (57 lines):

diff -r 9162d4e00c96 -r 4b475372d743 usr.bin/quota/quota.c
--- a/usr.bin/quota/quota.c     Sun Jul 13 01:17:15 2014 +0000
+++ b/usr.bin/quota/quota.c     Sun Jul 13 01:46:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $      */
+/*     $NetBSD: quota.c,v 1.50 2014/07/13 01:46:04 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)quota.c    8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $");
+__RCSID("$NetBSD: quota.c,v 1.50 2014/07/13 01:46:04 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -502,30 +502,6 @@
                        }
                        err(1, "%s: quota_open", fst[i].f_mntonname);
                }
-#if 0
-               if (strncmp(fst[i].f_fstypename, "nfs", 
-                   sizeof(fst[i].f_fstypename)) == 0) {
-                       version = 0;
-                       qup->numqvs = QUOTA_NLIMITS;
-                       qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0]));
-                       if (qup->qvs == NULL) {
-                               err(1, "Out of memory");
-                       }
-                       if (getnfsquota(fst[i].f_mntfromname,
-                           qup->qvs, id, ufs_quota_class_names[idtype]) != 1)
-                               continue;
-               } else if ((fst[i].f_flag & ST_QUOTA) != 0) {
-                       qup->numqvs = QUOTA_NLIMITS;
-                       qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0]));
-                       if (qup->qvs == NULL) {
-                               err(1, "Out of memory");
-                       }
-                       if (getvfsquota(fst[i].f_mntonname, qup->qvs, &version,
-                           id, idtype, dflag, 0) != 1)
-                               continue;
-               } else
-                       continue;
-#else
                qup->numqvs = quota_getnumidtypes(qup->qh);
                qup->qvs = malloc(qup->numqvs * sizeof(qup->qvs[0]));
                if (qup->qvs == NULL) {
@@ -547,7 +523,6 @@
                                quotaval_clear(&qup->qvs[j]);
                        }
                }
-#endif
                (void)strlcpy(qup->fsname, fst[i].f_mntonname,
                    sizeof(qup->fsname));
                if (quphead == NULL)



Home | Main Index | Thread Index | Old Index