[dovecot-cvs] dovecot/src/plugins/imap-quota imap-quota-plugin.c, 1.9, 1.10

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/imap-quota
In directory talvi:/tmp/cvs-serv23558/imap-quota

Modified Files:
	imap-quota-plugin.c 
Log Message:
s/quota/quota_set/ so we don't conflict with the quota symbol already
present in Mac OS X.



Index: imap-quota-plugin.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/imap-quota/imap-quota-plugin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imap-quota-plugin.c	30 Jul 2006 18:31:23 -0000	1.9
+++ imap-quota-plugin.c	12 Nov 2006 18:48:32 -0000	1.10
@@ -72,7 +72,7 @@
 		return TRUE;
 	}
 
-	if (quota == NULL) {
+	if (quota_set == NULL) {
 		mailbox_close(&box);
 		client_send_tagline(cmd, "OK No quota.");
 		return TRUE;
@@ -83,7 +83,7 @@
 	str_append(str, "* QUOTAROOT ");
 	imap_quote_append_string(str, mailbox, FALSE);
 
-	iter = quota_root_iter_init(quota, box);
+	iter = quota_root_iter_init(quota_set, box);
 	while ((root = quota_root_iter_next(iter)) != NULL) {
 		str_append_c(str, ' ');
 		imap_quote_append_string(str, quota_root_get_name(root), FALSE);
@@ -92,7 +92,7 @@
 	client_send_line(cmd->client, str_c(str));
 
 	/* send QUOTA reply for each quotaroot */
-	iter = quota_root_iter_init(quota, box);
+	iter = quota_root_iter_init(quota_set, box);
 	while ((root = quota_root_iter_next(iter)) != NULL)
 		quota_send(cmd, root);
 	quota_root_iter_deinit(iter);
@@ -112,12 +112,12 @@
 	if (!client_read_string_args(cmd, 1, &root_name))
 		return FALSE;
 
-	if (quota == NULL) {
+	if (quota_set == NULL) {
 		client_send_tagline(cmd, "OK No quota.");
 		return TRUE;
 	}
 
-	root = quota_root_lookup(quota, root_name);
+	root = quota_root_lookup(quota_set, root_name);
 	if (root == NULL) {
 		client_send_tagline(cmd, "NO Quota root doesn't exist.");
 		return TRUE;
@@ -145,12 +145,12 @@
 		return TRUE;
 	}
 
-	if (quota == NULL) {
+	if (quota_set == NULL) {
 		client_send_tagline(cmd, "OK No quota.");
 		return TRUE;
 	}
 
-	root = quota_root_lookup(quota, root_name);
+	root = quota_root_lookup(quota_set, root_name);
 	if (root == NULL) {
 		client_send_tagline(cmd, "NO Quota root doesn't exist.");
 		return TRUE;