From: Timo Sirainen Date: Fri, 7 Mar 2025 10:26:39 +0000 (+0200) Subject: lib-storage: Move mailbox_get_name_without_prefix() X-Git-Tag: 2.4.1~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e85cd861693605cf801bcd164dd335a8d0c641e;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Move mailbox_get_name_without_prefix() --- diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c index 70cf532a13..b172440fec 100644 --- a/src/lib-storage/mail-storage.c +++ b/src/lib-storage/mail-storage.c @@ -66,6 +66,22 @@ ARRAY_TYPE(mail_storage) mail_storage_classes; static int mail_storage_init_refcount = 0; +static const char * +mailbox_get_name_without_prefix(struct mail_namespace *ns, + const char *vname) +{ + if (ns->prefix_len > 0 && + strncmp(ns->prefix, vname, ns->prefix_len-1) == 0) { + if (vname[ns->prefix_len-1] == mail_namespace_get_sep(ns)) + vname += ns->prefix_len; + else if (vname[ns->prefix_len-1] == '\0') { + /* namespace prefix itself */ + vname = ""; + } + } + return vname; +} + void mail_storage_init(void) { if (mail_storage_init_refcount++ > 0) @@ -3463,22 +3479,6 @@ mail_storage_settings_to_index_flags(const struct mail_storage_settings *set) return index_flags; } -static const char * -mailbox_get_name_without_prefix(struct mail_namespace *ns, - const char *vname) -{ - if (ns->prefix_len > 0 && - strncmp(ns->prefix, vname, ns->prefix_len-1) == 0) { - if (vname[ns->prefix_len-1] == mail_namespace_get_sep(ns)) - vname += ns->prefix_len; - else if (vname[ns->prefix_len-1] == '\0') { - /* namespace prefix itself */ - vname = ""; - } - } - return vname; -} - static void mailbox_settings_filters_add(struct event *event, struct mailbox_list *list, const char *vname)