[dovecot-cvs] dovecot/src/plugins/imap-quota imap-quota-plugin.c, 1.7.2.1, 1.7.2.2

tss at dovecot.org tss at dovecot.org
Sun Nov 12 18:48:30 UTC 2006


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

Modified Files:
      Tag: branch_1_0
	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.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- imap-quota-plugin.c	1 Jul 2006 22:27:28 -0000	1.7.2.1
+++ imap-quota-plugin.c	12 Nov 2006 18:48:27 -0000	1.7.2.2
@@ -38,7 +38,7 @@
 			i++;
 		} else if (ret < 0) {
 			client_send_line(cmd->client, t_strconcat(
-				"* BAD ", quota_last_error(quota), NULL));
+				"* BAD ", quota_last_error(quota_set), NULL));
 		}
 	}
 	str_append_c(str, ')');
@@ -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;
@@ -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;
@@ -168,7 +168,7 @@
                 value = strtoull(IMAP_ARG_STR_NONULL(&arg[1]), NULL, 10);
 		if (quota_set_resource(root, name, value) < 0) {
 			client_send_command_error(cmd,
-						  quota_last_error(quota));
+						  quota_last_error(quota_set));
 			return TRUE;
 		}
 	}



More information about the dovecot-cvs mailing list