imap: rename imap_parse_path2() imap_parse_path()

diff --git a/imap/browse.c b/imap/browse.c
index 04ed04a1b24e090d3a109625cc9cf2e6de96395a..40aaf64968b795094a59b1400c195370234f6b2c 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -68,7 +68,7 @@ static void add_folder(char delim, char *folder, bool noselect, bool noinferiors
   struct ConnAccount conn_account;
   char mailbox[LONG_STRING];
 
-  if (imap_parse_path2(state->folder, &conn_account, mailbox, sizeof(mailbox)))
+  if (imap_parse_path(state->folder, &conn_account, mailbox, sizeof(mailbox)))
     return;
 
   if (state->entrylen + 1 == state->entrymax)
@@ -196,7 +196,7 @@ int imap_browse(char *path, struct BrowserState *state)
   bool showparents = false;
   bool save_lsub;
 
-  if (imap_parse_path2(path, &conn_account, buf, sizeof(buf)))
+  if (imap_parse_path(path, &conn_account, buf, sizeof(buf)))
   {
     mutt_error(_("%s is an invalid IMAP path"), path);
     return -1;

diff --git a/imap/imap.c b/imap/imap.c
index fdac8915c100dc42d53801ec1c80ce382f0069b2..e8e428cbe78b22841a341e4440e2ac661d78a84c 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -2064,7 +2064,7 @@ int imap_ac_add(struct Account *a, struct Mailbox *m)
     struct ConnAccount *conn_account = mutt_mem_calloc(1, sizeof(struct ConnAccount));
     char mailbox[LONG_STRING];
 
-    if (imap_parse_path2(m->path, conn_account, mailbox, sizeof(mailbox)) < 0)
+    if (imap_parse_path(m->path, conn_account, mailbox, sizeof(mailbox)) < 0)
       return -1;
 
     if (!a->adata)
@@ -2226,7 +2226,7 @@ static int imap_mbox_open(struct Context *ctx)
   char p_mailbox[LONG_STRING];
 
   if ((imap_path_probe(Postponed, NULL) == MUTT_IMAP) &&
-      !imap_parse_path2(Postponed, &p_conn_account, p_mailbox, sizeof(p_mailbox)) &&
+      !imap_parse_path(Postponed, &p_conn_account, p_mailbox, sizeof(p_mailbox)) &&
       mutt_account_match(&p_conn_account, &adata->conn_account))
   {
     imap_status(Postponed, true);

diff --git a/imap/imap.h b/imap/imap.h
index 4ffda85e78a68cd8eb1b0696962a1c77a8f7fcb0..6a90ca5774203433a2b9d1fc24d1a1f4484ee775 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -103,7 +103,7 @@ int imap_copy_messages(struct Context *ctx, struct Email *e, char *dest, bool de
 void imap_logout_all(void);
 
 /* util.c */
-int imap_parse_path2(const char *path, struct ConnAccount *account, char *mailbox, size_t mailboxlen);
+int imap_parse_path(const char *path, struct ConnAccount *account, char *mailbox, size_t mailboxlen);
 void imap_pretty_mailbox(char *path, const char *folder);
 
 int imap_wait_keepalive(pid_t pid);

diff --git a/imap/message.c b/imap/message.c
index a5eab43161a039f5c0c44451e11a18c349e11cdb..a080af4954e304f9953ef49921fa6d8dbfbdf682 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1529,7 +1529,7 @@ int imap_copy_messages(struct Context *ctx, struct Email *e, char *dest, bool de
 
   struct ImapAccountData *adata = imap_adata_get(m);
 
-  if (imap_parse_path2(dest, &conn_account, buf, sizeof(buf)))
+  if (imap_parse_path(dest, &conn_account, buf, sizeof(buf)))
   {
     mutt_debug(1, "bad destination %s\n", dest);
     return -1;

diff --git a/imap/util.c b/imap/util.c
index c979d76307beb0a39cbec0f6545cf12ecb23a845..e5ec3f8c309c335a3aa21d701a5358a6817ca404 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -133,7 +133,7 @@ int imap_adata_find(const char *path, struct ImapAccountData **adata,
   struct ImapAccountData *tmp_adata;
   char tmp[LONG_STRING];
 
-  if (imap_parse_path2(path, &conn_account, tmp, sizeof(tmp)) < 0)
+  if (imap_parse_path(path, &conn_account, tmp, sizeof(tmp)) < 0)
     return -1;
 
   struct Account *np = NULL;
@@ -542,7 +542,7 @@ char *imap_hcache_get_uid_seqset(struct ImapAccountData *adata)
 #endif
 
 /**
- * imap_parse_path2 - Parse an IMAP mailbox name into ConnAccount, name
+ * imap_parse_path - Parse an IMAP mailbox name into ConnAccount, name
  * @param path       Mailbox path to parse
  * @param account    Account credentials
  * @param mailbox    Buffer for mailbox name
@@ -553,7 +553,7 @@ char *imap_hcache_get_uid_seqset(struct ImapAccountData *adata)
  * Given an IMAP mailbox name, return host, port and a path IMAP servers will
  * recognize.  mx.mbox is malloc'd, caller must free it
  */
-int imap_parse_path2(const char *path, struct ConnAccount *account, char *mailbox, size_t mailboxlen)
+int imap_parse_path(const char *path, struct ConnAccount *account, char *mailbox, size_t mailboxlen)
 {
   static unsigned short ImapPort = 0;
   static unsigned short ImapsPort = 0;
@@ -671,13 +671,13 @@ void imap_pretty_mailbox(char *path, const char *folder)
   char target_mailbox[LONG_STRING];
   char home_mailbox[LONG_STRING];
 
-  if (imap_parse_path2(path, &target_conn_account, target_mailbox, sizeof(target_mailbox)) < 0)
+  if (imap_parse_path(path, &target_conn_account, target_mailbox, sizeof(target_mailbox)) < 0)
     return;
 
   if (imap_path_probe(folder, NULL) != MUTT_IMAP)
     goto fallback;
 
-  if (imap_parse_path2(folder, &home_conn_account, home_mailbox, sizeof(home_mailbox)) < 0)
+  if (imap_parse_path(folder, &home_conn_account, home_mailbox, sizeof(home_mailbox)) < 0)
     goto fallback;
 
   tlen = mutt_str_strlen(target_mailbox);