 @@ -36,26 +36,27 @@
 struct quotahandle; /* Opaque. */
 struct quotacursor; /* Opaque. */
 void quotaval_clear(struct quotaval *);
 struct quotahandle *quota_open(const char *);
 void quota_close(struct quotahandle *);
 const char *quota_getmountpoint(struct quotahandle *);
 const char *quota_getmountdevice(struct quotahandle *);
 const char *quota_getimplname(struct quotahandle *);
 unsigned quota_getrestrictions(struct quotahandle *);
 unsigned quota_getnumidtypes(struct quotahandle *);
 const char *quota_idtype_getname(struct quotahandle *, int /*idtype*/);
 unsigned quota_getnumobjtypes(struct quotahandle *);
 const char *quota_objtype_getname(struct quotahandle *, int /*objtype*/);
 int quota_objtype_isbytes(struct quotahandle *, int /*objtype*/);
 int quota_get(struct quotahandle *, const struct quotakey *,
 	      struct quotaval *);
 int quota_put(struct quotahandle *, const struct quotakey *,
 	      const struct quotaval *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quota_proplib.c,v 1.8 2012/01/30 06:00:49 dholland Exp $	*/
+/*	$NetBSD: quota_proplib.c,v 1.9 2012/01/30 16:44:08 dholland Exp $	*/
 /*-
   * Copyright (c) 2011 Manuel Bouyer
   * All rights reserved.
+  *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in the
   *    documentation and/or other materials provided with the distribution.
+  *
 @@ -16,27 +16,27 @@
   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
   * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
   * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   * POSSIBILITY OF SUCH DAMAGE.
   */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: quota_proplib.c,v 1.8 2012/01/30 06:00:49 dholland Exp $");
+__RCSID("$NetBSD: quota_proplib.c,v 1.9 2012/01/30 16:44:08 dholland Exp $");
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <errno.h>
 #include <err.h>
 #include <quota.h>
 #include "quotapvt.h"
 #include <quota/quotaprop.h>
 #include <quota/quota.h>
 @@ -171,26 +171,44 @@ __quota_proplib_getimplname(struct quota
 	if (__quota_proplib_getversion(qh, &version) < 0) {
 		return NULL;
+	}
 	switch (version) {
 		case 1: return "ffs quota1";
 		case 2: return "ffs quota2";
 		default: break;
+	}
 	return "unknown";
+}
 unsigned
 __quota_proplib_getrestrictions(struct quotahandle *qh)
+{
 	int8_t version;
 	if (__quota_proplib_getversion(qh, &version) < 0) {
 		/* XXX no decent way to report an error here */
 		return 0;
+	}
 	switch (version) {
 		case 1: return QUOTA_RESTRICT_NEEDSQUOTACHECK |
 				QUOTA_RESTRICT_UNIFORMGRACE |
 				QUOTA_RESTRICT_32BIT;
 		default: break;
+	}
 	return 0;
+}
 unsigned
 __quota_proplib_getnumidtypes(void)
+{
 	return QUOTA_NCLASS;
+}
 const char *
 __quota_proplib_idtype_getname(int idtype)
+{
 	if (idtype < 0 || idtype >= QUOTA_NCLASS) {
 		return NULL;
+	}
 	return ufs_quota_class_names[idtype];
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quota_schema.c,v 1.4 2012/01/25 17:43:37 dholland Exp $	*/
+/*	$NetBSD: quota_schema.c,v 1.5 2012/01/30 16:44:09 dholland Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David A. Holland.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: quota_schema.c,v 1.4 2012/01/25 17:43:37 dholland Exp $");
+__RCSID("$NetBSD: quota_schema.c,v 1.5 2012/01/30 16:44:09 dholland Exp $");
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <quota.h>
 #include "quotapvt.h"
 /*
  * Functions for getting information about idtypes and such.
  */
 @@ -55,114 +55,131 @@ quota_getimplname(struct quotahandle *qh
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_getimplname(qh);
 	    case QUOTA_MODE_OLDFILES:
 		return __quota_proplib_getimplname(qh);
 	    default:
 		break;
+	}
 	errno = EINVAL;
 	return NULL;
+}
-/* ARGSUSED */
+unsigned
 quota_getrestrictions(struct quotahandle *qh)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_NFS:
 		/* XXX this should maybe report the rquotad protocol version */
 		return QUOTA_RESTRICT_32BIT | QUOTA_RESTRICT_READONLY;
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_getrestrictions(qh);
 	    case QUOTA_MODE_OLDFILES:
 		return QUOTA_RESTRICT_NEEDSQUOTACHECK |
 			QUOTA_RESTRICT_UNIFORMGRACE |
 			QUOTA_RESTRICT_32BIT;
 	    default:
 		break;
+	}
 	errno = EINVAL;
 	return 0;
+}
 unsigned
 quota_getnumidtypes(struct quotahandle *qh)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_NFS:
 		/* XXX for old rquotad versions this should be 1... */
 		return 2;
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_getnumidtypes();
 	    case QUOTA_MODE_OLDFILES:
 	    default:
 		break;
+	}
 	return 2;
+}
 /* ARGSUSED */
 const char *
 quota_idtype_getname(struct quotahandle *qh, int idtype)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_idtype_getname(idtype);
 	    case QUOTA_MODE_NFS:
 	    case QUOTA_MODE_OLDFILES:
 		break;
+	}
 	switch (idtype) {
 	    case QUOTA_IDTYPE_USER:
 		return "user";
 	    case QUOTA_IDTYPE_GROUP:
 		return "group";
 	    default:
 		break;
+	}
 	errno = EINVAL;
 	return "???";
+}
 /* ARGSUSED */
 unsigned
 quota_getnumobjtypes(struct quotahandle *qh)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_getnumobjtypes();
 	    case QUOTA_MODE_NFS:
 	    case QUOTA_MODE_OLDFILES:
 	    default:
 		break;
+	}
 	return 2;
+}
 /* ARGSUSED */
 const char *
 quota_objtype_getname(struct quotahandle *qh, int objtype)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_objtype_getname(objtype);
 	    case QUOTA_MODE_NFS:
 	    case QUOTA_MODE_OLDFILES:
 	    default:
 		break;
+	}
 	switch (objtype) {
 	    case QUOTA_OBJTYPE_BLOCKS:
 		return "block";
 	    case QUOTA_OBJTYPE_FILES:
 		return "file";
 	    default:
 		break;
+	}
 	errno = EINVAL;
 	return "???"; /* ? */
+}
 /* ARGSUSED */
 int
 quota_objtype_isbytes(struct quotahandle *qh, int objtype)
+{
 	switch (qh->qh_mode) {
 	    case QUOTA_MODE_PROPLIB:
 		return __quota_proplib_objtype_isbytes(objtype);
 	    case QUOTA_MODE_NFS:
 	    case QUOTA_MODE_OLDFILES:
 	    default:
 		break;
+	}
 	switch (objtype) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quotapvt.h,v 1.10 2012/01/25 17:43:37 dholland Exp $	*/
+/*	$NetBSD: quotapvt.h,v 1.11 2012/01/30 16:44:09 dholland Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David A. Holland.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -48,26 +48,27 @@ struct quotahandle {
 struct quotacursor {
 	struct quotahandle *qc_qh;
 	enum { QC_PROPLIB, QC_OLDFILES } qc_type;
 	union {
 		struct proplib_quotacursor *qc_proplib;
 		struct oldfiles_quotacursor *qc_oldfiles;
 	} u;
 };
 /* proplib kernel interface */
 int __quota_proplib_getversion(struct quotahandle *qh, int8_t *version_ret);
 const char *__quota_proplib_getimplname(struct quotahandle *);
 unsigned __quota_proplib_getrestrictions(struct quotahandle *);
 unsigned __quota_proplib_getnumidtypes(void);
 const char *__quota_proplib_idtype_getname(int idtype);
 unsigned __quota_proplib_getnumobjtypes(void);
 const char *__quota_proplib_objtype_getname(int objtype);
 int __quota_proplib_objtype_isbytes(int objtype);
 int __quota_proplib_get(struct quotahandle *qh, const struct quotakey *qk,
 			struct quotaval *qv);
 int __quota_proplib_put(struct quotahandle *qh, const struct quotakey *qk,
 			const struct quotaval *qv);
 int __quota_proplib_delete(struct quotahandle *qh, const struct quotakey *qk);
 struct proplib_quotacursor *__quota_proplib_cursor_create(void);
 void __quota_proplib_cursor_destroy(struct proplib_quotacursor *);
 int __quota_proplib_cursor_skipidtype(struct proplib_quotacursor *,