CVS commit: [bouyer-quota2] src/sbin/fsck_ffs

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Tue Feb  8 14:50:37 UTC 2011

Modified Files:
        src/sbin/fsck_ffs [bouyer-quota2]: quota2.c

Log Message:
Q2V_ -> QL_ rename


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/fsck_ffs/quota2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/fsck_ffs/quota2.c
diff -u src/sbin/fsck_ffs/quota2.c:1.1.2.1 src/sbin/fsck_ffs/quota2.c:1.1.2.2
--- src/sbin/fsck_ffs/quota2.c:1.1.2.1	Thu Jan 20 14:24:54 2011
+++ src/sbin/fsck_ffs/quota2.c	Tue Feb  8 14:50:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.c,v 1.1.2.1 2011/01/20 14:24:54 bouyer Exp $ */
+/* $NetBSD: quota2.c,v 1.1.2.2 2011/02/08 14:50:37 bouyer Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -117,8 +117,8 @@
 
 	memcpy(q2e, &q2h->q2h_defentry, sizeof(*q2e));
 	q2e->q2e_uid = iswap32(uid);
-	q2e->q2e_val[Q2V_BLOCK].q2v_cur = iswap64(u_b);
-	q2e->q2e_val[Q2V_FILE].q2v_cur = iswap64(u_i);
+	q2e->q2e_val[QL_BLOCK].q2v_cur = iswap64(u_b);
+	q2e->q2e_val[QL_FILE].q2v_cur = iswap64(u_i);
 	/* insert in hash list */
 	q2e->q2e_next = q2h->q2h_entries[uid & q2h_hash_mask];
 	q2h->q2h_entries[uid & q2h_hash_mask] = iswap64(off);
@@ -439,21 +439,21 @@
 	else
 		remove_uquot(a->uquot_hash, uq);
 		
-	if (iswap64(q2e->q2e_val[Q2V_BLOCK].q2v_cur) == uq->uq_b && 
-	    iswap64(q2e->q2e_val[Q2V_FILE].q2v_cur) == uq->uq_i)
+	if (iswap64(q2e->q2e_val[QL_BLOCK].q2v_cur) == uq->uq_b && 
+	    iswap64(q2e->q2e_val[QL_FILE].q2v_cur) == uq->uq_i)
 		return 0;
 	pwarn("%s QUOTA MISMATCH FOR ID %d: %" PRIu64 "/%" PRIu64 " SHOULD BE "
 	    "%" PRIu64 "/%" PRIu64, a->capstrtype, uid,
-	    iswap64(q2e->q2e_val[Q2V_BLOCK].q2v_cur),
-	    iswap64(q2e->q2e_val[Q2V_FILE].q2v_cur), uq->uq_b, uq->uq_i);
+	    iswap64(q2e->q2e_val[QL_BLOCK].q2v_cur),
+	    iswap64(q2e->q2e_val[QL_FILE].q2v_cur), uq->uq_b, uq->uq_i);
 	if (preen) {
 		printf(" (FIXED)\n");
 	} else if (!reply("FIX")) {
 		markclean = 0;
 		return 0;
 	}
-	q2e->q2e_val[Q2V_BLOCK].q2v_cur = iswap64(uq->uq_b);
-	q2e->q2e_val[Q2V_FILE].q2v_cur = iswap64(uq->uq_i);
+	q2e->q2e_val[QL_BLOCK].q2v_cur = iswap64(uq->uq_b);
+	q2e->q2e_val[QL_FILE].q2v_cur = iswap64(uq->uq_i);
 	return Q2WL_DIRTY;
 }