quota: Rename quota_root_settings to quota_root_legacy_settings

diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index d4f38a91a780a52a526605d1e02d7d0017982209..f6252848c997b28b80256691868ee85dec80bbcb 100644 (file)
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -28,7 +28,7 @@ struct quota {
 struct quota_legacy_settings {
        pool_t pool;
 
-       ARRAY(struct quota_root_settings *) root_sets;
+       ARRAY(struct quota_root_legacy_settings *) root_sets;
 };
 
 struct quota_rule {
@@ -82,7 +82,7 @@ struct quota_backend {
        struct quota_backend_vfuncs v;
 };
 
-struct quota_root_settings {
+struct quota_root_legacy_settings {
        /* Unique quota root name. */
        const char *name;
        /* Name in settings, e.g. "quota", "quota2", .. */
@@ -103,7 +103,7 @@ struct quota_root_settings {
 struct quota_root {
        pool_t pool;
 
-       struct quota_root_settings *set;
+       struct quota_root_legacy_settings *set;
        struct quota *quota;
        struct quota_backend backend;
 
@@ -186,7 +186,7 @@ struct quota *quota_get_mail_user_quota(struct mail_user *user);
 bool quota_root_is_namespace_visible(struct quota_root *root,
                                     struct mail_namespace *ns);
 struct quota_rule *
-quota_root_rule_find(struct quota_root_settings *root_set, const char *name);
+quota_root_rule_find(struct quota_root_legacy_settings *root_set, const char *name);
 
 /* Returns 1 if values were returned successfully, 0 if we're recursing into
    the same function, -1 if error. */
@@ -194,7 +194,7 @@ int quota_count(struct quota_root *root, uint64_t *bytes_r, uint64_t *count_r,
                enum quota_get_result *error_result_r, const char **error_r);
 
 int quota_root_parse_grace(struct event *event,
-                          struct quota_root_settings *root_set,
+                          struct quota_root_legacy_settings *root_set,
                           const char *value, const char **error_r);
 bool quota_warning_match(struct quota_root *root,
                         const struct quota_warning_rule *w,

diff --git a/src/plugins/quota/quota-util.c b/src/plugins/quota/quota-util.c
index a4050be8eaf713aecee1e3cc1703e5611c526dfc..63b77b4158eb6c00ea44018f3ff2e0a2d56ba5da 100644 (file)
--- a/src/plugins/quota/quota-util.c
+++ b/src/plugins/quota/quota-util.c
@@ -12,7 +12,7 @@
 #define RULE_NAME_DEFAULT_FORCE "*"
 
 struct quota_rule *
-quota_root_rule_find(struct quota_root_settings *root_set, const char *name)
+quota_root_rule_find(struct quota_root_legacy_settings *root_set, const char *name)
 {
        struct quota_rule *rule;
 
@@ -24,7 +24,7 @@ quota_root_rule_find(struct quota_root_settings *root_set, const char *name)
 }
 
 static struct quota_rule *
-quota_root_rule_find_exact(struct quota_root_settings *root_set,
+quota_root_rule_find_exact(struct quota_root_legacy_settings *root_set,
                           const char *name)
 {
        struct quota_rule *rule;
@@ -37,7 +37,7 @@ quota_root_rule_find_exact(struct quota_root_settings *root_set,
 }
 
 static int
-quota_rule_parse_percentage(struct quota_root_settings *root_set,
+quota_rule_parse_percentage(struct quota_root_legacy_settings *root_set,
                            struct quota_rule *rule,
                            int64_t *limit, const char **error_r)
 {
@@ -62,7 +62,7 @@ quota_rule_parse_percentage(struct quota_root_settings *root_set,
        return 0;
 }
 
-static int quota_limit_parse(struct quota_root_settings *root_set,
+static int quota_limit_parse(struct quota_root_legacy_settings *root_set,
                             struct quota_rule *rule, const char *unit,
                             uint64_t multiply, int64_t *limit,
                             const char **error_r)
@@ -102,7 +102,7 @@ static int quota_limit_parse(struct quota_root_settings *root_set,
 
 static int
 quota_rule_parse_limits(struct event *event,
-                       struct quota_root_settings *root_set,
+                       struct quota_root_legacy_settings *root_set,
                        struct quota_rule *rule, const char *limits,
                        const char *full_rule_def,
                        bool relative_rule, const char **error_r)
@@ -187,7 +187,7 @@ quota_rule_parse_limits(struct event *event,
 }
 
 int quota_root_add_rule(struct event *event, pool_t pool,
-                       struct quota_root_settings *root_set,
+                       struct quota_root_legacy_settings *root_set,
                        const char *rule_def, const char **error_r)
 {
        struct quota_rule *rule;
@@ -244,7 +244,7 @@ int quota_root_add_rule(struct event *event, pool_t pool,
 }
 
 int quota_root_add_warning_rule(struct event *event, pool_t pool,
-                               struct quota_root_settings *root_set,
+                               struct quota_root_legacy_settings *root_set,
                                const char *rule_def, const char **error_r)
 {
        struct quota_warning_rule *warning;
@@ -296,7 +296,7 @@ int quota_root_add_warning_rule(struct event *event, pool_t pool,
 }
 
 int quota_root_parse_grace(struct event *event,
-                          struct quota_root_settings *root_set,
+                          struct quota_root_legacy_settings *root_set,
                           const char *value, const char **error_r)
 {
        if (value == NULL) {

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 115d64c9c3d1d3713258ab423ac54a8f4213ea10..c2ca6f03931fb22dfdd0e8b8745c8c3c31509ed8 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -118,7 +118,7 @@ void quota_backends_unregister(void)
 }
 
 static int quota_root_add_rules(struct mail_user *user, const char *root_name,
-                               pool_t pool, struct quota_root_settings *root_set,
+                               pool_t pool, struct quota_root_legacy_settings *root_set,
                                const char **error_r)
 {
        const char *rule_name, *rule, *error;
@@ -143,7 +143,7 @@ static int quota_root_add_rules(struct mail_user *user, const char *root_name,
 
 static int
 quota_root_add_warning_rules(struct mail_user *user, const char *root_name,
-                            pool_t pool, struct quota_root_settings *root_set,
+                            pool_t pool, struct quota_root_legacy_settings *root_set,
                             const char **error_r)
 {
        const char *rule_name, *rule, *error;
@@ -169,10 +169,10 @@ quota_root_add_warning_rules(struct mail_user *user, const char *root_name,
 static int
 quota_root_settings_init(struct event *event,
                         struct quota_legacy_settings *quota_set, const char *root_def,
-                        struct quota_root_settings **set_r,
+                        struct quota_root_legacy_settings **set_r,
                         const char **error_r)
 {
-       struct quota_root_settings *root_set;
+       struct quota_root_legacy_settings *root_set;
        const struct quota_backend *backend;
        const char *p, *args, *backend_name;
 
@@ -193,7 +193,7 @@ quota_root_settings_init(struct event *event,
                return -1;
        }
 
-       root_set = p_new(quota_set->pool, struct quota_root_settings, 1);
+       root_set = p_new(quota_set->pool, struct quota_root_legacy_settings, 1);
        root_set->backend = backend;
 
        if (args != NULL) {
@@ -227,7 +227,7 @@ quota_root_add(struct quota_legacy_settings *quota_set, struct mail_user *user,
               pool_t pool, const char *env, const char *root_name,
               const char **error_r)
 {
-       struct quota_root_settings *root_set;
+       struct quota_root_legacy_settings *root_set;
        const char *set_name, *value;
 
        if (quota_root_settings_init(user->event, quota_set, env,
@@ -341,7 +341,7 @@ int quota_root_default_init(struct quota_root *root, const char *args,
 }
 
 static int
-quota_root_init(struct quota_root_settings *root_set, struct quota *quota,
+quota_root_init(struct quota_root_legacy_settings *root_set, struct quota *quota,
                struct quota_root **root_r, const char **error_r)
 {
        struct quota_root *root;
@@ -387,7 +387,7 @@ int quota_init(struct quota_legacy_settings *quota_set, struct mail_user *user,
 {
        struct quota *quota;
        struct quota_root *root;
-       struct quota_root_settings *const *root_sets;
+       struct quota_root_legacy_settings *const *root_sets;
        unsigned int i, count;
        const char *error;
        int ret;

diff --git a/src/plugins/quota/quota.h b/src/plugins/quota/quota.h
index 86ffd9fe6ffa61c99bbbc88b6cee4f1907f15684..5828c07619e90c599b94e751f1172eac0a451247 100644 (file)
--- a/src/plugins/quota/quota.h
+++ b/src/plugins/quota/quota.h
@@ -14,7 +14,7 @@ struct mail_user;
 
 struct quota;
 struct quota_legacy_settings;
-struct quota_root_settings;
+struct quota_root_legacy_settings;
 struct quota_root;
 struct quota_root_iter;
 struct quota_transaction_context;
@@ -78,12 +78,12 @@ void quota_settings_deinit(struct quota_legacy_settings **quota_set);
 
 /* Add a new rule too the quota root. Returns 0 if ok, -1 if rule is invalid. */
 int quota_root_add_rule(struct event *event, pool_t pool,
-                       struct quota_root_settings *root_set,
+                       struct quota_root_legacy_settings *root_set,
                        const char *rule_def, const char **error_r);
 /* Add a new warning rule for the quota root. Returns 0 if ok, -1 if rule is
    invalid. */
 int quota_root_add_warning_rule(struct event *event, pool_t pool,
-                               struct quota_root_settings *root_set,
+                               struct quota_root_legacy_settings *root_set,
                                const char *rule_def, const char **error_r);
 
 /* Initialize quota for the given user. Returns 0 and quota_r on success,