imap: imap-progress - Rename imap_storage_callback_line() to imap_progress_line()

diff --git a/src/imap/imap-progress.c b/src/imap/imap-progress.c
index 95f72376d303ea50db683aa8e8c0ca123df45581..0e1c17468e4fa2807b5d8debfb2301074f0dfca9 100644 (file)
--- a/src/imap/imap-progress.c
+++ b/src/imap/imap-progress.c
@@ -7,8 +7,8 @@
 #include "imap-progress.h"
 
 const char *
-imap_storage_callback_line(const struct mail_storage_progress_details *dtl,
-                          const char *tag)
+imap_progress_line(const struct mail_storage_progress_details *dtl,
+                  const char *tag)
 {
        const char *verb = dtl->verb;
        unsigned int total = dtl->total;

diff --git a/src/imap/imap-progress.h b/src/imap/imap-progress.h
index 9a75701ad3727a864525c53e7ad9d6358665415b..c83e0931a38c42c20284040cd033e26f630087cd 100644 (file)
--- a/src/imap/imap-progress.h
+++ b/src/imap/imap-progress.h
@@ -2,7 +2,7 @@
 #define IMAP_PROGRESS_H
 
 const char *
-imap_storage_callback_line(const struct mail_storage_progress_details *dtl,
-                          const char *tag);
+imap_progress_line(const struct mail_storage_progress_details *dtl,
+                  const char *tag);
 
 #endif

diff --git a/src/imap/imap-storage-callbacks.c b/src/imap/imap-storage-callbacks.c
index 9858e70b87f6d024b2990a0078229193622c83b6..d335e457d3dc4e5cfa6bac34f55e1d35d6adbd3b 100644 (file)
--- a/src/imap/imap-storage-callbacks.c
+++ b/src/imap/imap-storage-callbacks.c
@@ -57,7 +57,7 @@ int imap_notify_progress(const struct mail_storage_progress_details *dtl,
        T_BEGIN {
                bool corked = o_stream_is_corked(client->output);
                const char *tag = find_cmd_tag(event_get_global());
-               const char *line = imap_storage_callback_line(dtl, tag);
+               const char *line = imap_progress_line(dtl, tag);
 
                client_send_line(client, line);
                ret = o_stream_uncork_flush(client->output);

diff --git a/src/imap/test-imap-storage-callbacks.c b/src/imap/test-imap-storage-callbacks.c
index 71a5d3c710c910baf87f54c28cc5be5be62cb28f..95ad29775cd7ad5903358e6869729cc1a49e972d 100644 (file)
--- a/src/imap/test-imap-storage-callbacks.c
+++ b/src/imap/test-imap-storage-callbacks.c
@@ -44,7 +44,7 @@ static void test_imap_storage_callback_line(void)
        test_begin("imap_storage_callback_line");
        for (unsigned int index = 0; index < N_ELEMENTS(test_vectors); ++index ) {
                const struct test_vector *v = test_vectors + index;
-               const char *actual = imap_storage_callback_line(&v->dtl, v->tag);
+               const char *actual = imap_progress_line(&v->dtl, v->tag);
                test_assert_strcmp_idx(v->expect, actual, index);
        }
        test_end();