dovecot: Removed _ prefix from all public APIs.
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 13:53:18 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/46d9ee79f292
changeset: 6418:46d9ee79f292
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 12:43:21 2007 +0300
description:
Removed _ prefix from all public APIs.
diffstat:
23 files changed, 76 insertions(+), 77 deletions(-)
src/imap/client.c | 14 ++++++-------
src/imap/client.h | 4 +--
src/imap/cmd-append.c | 6 ++---
src/imap/cmd-examine.c | 2 -
src/imap/cmd-list.c | 6 ++---
src/imap/cmd-lsub.c | 2 -
src/imap/cmd-select.c | 4 +--
src/imap/cmd-subscribe.c | 4 +--
src/imap/cmd-unsubscribe.c | 2 -
src/imap/commands.h | 6 ++---
src/lib-imap/imap-parser.c | 6 ++---
src/lib-imap/imap-parser.h | 14 ++++++-------
src/lib/imem.c | 2 -
src/lib/strfuncs.c | 6 ++---
src/lib/strfuncs.h | 3 --
src/master/ssl-init-gnutls.c | 2 -
src/master/ssl-init-main.c | 2 -
src/master/ssl-init-openssl.c | 2 -
src/master/ssl-init.h | 2 -
src/plugins/fts-squat/squat-test.c | 2 -
src/plugins/fts-squat/squat-trie.c | 22 ++++++++++-----------
src/plugins/fts-squat/squat-trie.h | 6 ++---
src/plugins/fts-squat/squat-uidlist.c | 34 ++++++++++++++++-----------------
diffs (truncated from 617 to 300 lines):
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/client.c
--- a/src/imap/client.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/client.c Sun Sep 16 12:43:21 2007 +0300
@@ -33,9 +33,9 @@ struct client *client_create(int fd_in,
client->input = i_stream_create_fd(fd_in, imap_max_line_length, FALSE);
client->output = o_stream_create_fd(fd_out, (size_t)-1, FALSE);
- o_stream_set_flush_callback(client->output, _client_output, client);
-
- client->io = io_add(fd_in, IO_READ, _client_input, client);
+ o_stream_set_flush_callback(client->output, client_output, client);
+
+ client->io = io_add(fd_in, IO_READ, client_input, client);
client->last_input = ioloop_time;
client->command_pool = pool_alloconly_create("client command", 8192);
@@ -437,7 +437,7 @@ static void client_add_missing_io(struct
{
if (client->io == NULL && !client->disconnected) {
client->io = io_add(client->fd_in,
- IO_READ, _client_input, client);
+ IO_READ, client_input, client);
}
}
@@ -467,7 +467,7 @@ void client_continue_pending_input(struc
/* if there's unread data in buffer, handle it. */
(void)i_stream_get_data(client->input, &size);
if (size > 0)
- _client_input(client);
+ client_input(client);
}
/* Skip incoming data until newline is found,
@@ -593,7 +593,7 @@ static bool client_handle_next_command(s
return client_command_input(client->input_lock);
}
-void _client_input(struct client *client)
+void client_input(struct client *client)
{
struct client_command_context *cmd;
int ret;
@@ -654,7 +654,7 @@ static void client_output_cmd(struct cli
}
}
-int _client_output(struct client *client)
+int client_output(struct client *client)
{
struct client_command_context *cmd, *next;
int ret;
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/client.h
--- a/src/imap/client.h Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/client.h Sun Sep 16 12:43:21 2007 +0300
@@ -108,7 +108,7 @@ void client_command_free(struct client_c
void client_continue_pending_input(struct client *client);
-void _client_input(struct client *client);
-int _client_output(struct client *client);
+void client_input(struct client *client);
+int client_output(struct client *client);
#endif
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-append.c
--- a/src/imap/cmd-append.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-append.c Sun Sep 16 12:43:21 2007 +0300
@@ -35,7 +35,7 @@ static bool cmd_append_continue_message(
static bool cmd_append_continue_message(struct client_command_context *cmd);
static bool cmd_append_continue_parsing(struct client_command_context *cmd);
-static void client_input(struct client_command_context *cmd)
+static void client_input_append(struct client_command_context *cmd)
{
struct cmd_append_context *ctx = cmd->context;
struct client *client = cmd->client;
@@ -125,7 +125,7 @@ static void cmd_append_finish(struct cmd
/* we must put back the original flush callback before beginning to
sync (the command is still unfinished at that point) */
o_stream_set_flush_callback(ctx->client->output,
- _client_output, ctx->client);
+ client_output, ctx->client);
if (ctx->input != NULL)
i_stream_unref(&ctx->input);
@@ -497,7 +497,7 @@ bool cmd_append(struct client_command_co
io_remove(&client->io);
client->io = io_add(i_stream_get_fd(client->input), IO_READ,
- client_input, cmd);
+ client_input_append, cmd);
/* append is special because we're only waiting on client input, not
client output, so disable the standard output handler until we're
finished */
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-examine.c
--- a/src/imap/cmd-examine.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-examine.c Sun Sep 16 12:43:21 2007 +0300
@@ -5,5 +5,5 @@
bool cmd_examine(struct client_command_context *cmd)
{
- return _cmd_select_full(cmd, TRUE);
+ return cmd_select_full(cmd, TRUE);
}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-list.c
--- a/src/imap/cmd-list.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-list.c Sun Sep 16 12:43:21 2007 +0300
@@ -711,7 +711,7 @@ static void cmd_list_ref_root(struct cli
client_send_line(client, str_c(str));
}
-bool _cmd_list_full(struct client_command_context *cmd, bool lsub)
+bool cmd_list_full(struct client_command_context *cmd, bool lsub)
{
struct client *client = cmd->client;
const struct imap_arg *args, *arg;
@@ -829,5 +829,5 @@ bool _cmd_list_full(struct client_comman
bool cmd_list(struct client_command_context *cmd)
{
- return _cmd_list_full(cmd, FALSE);
-}
+ return cmd_list_full(cmd, FALSE);
+}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-lsub.c
--- a/src/imap/cmd-lsub.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-lsub.c Sun Sep 16 12:43:21 2007 +0300
@@ -5,5 +5,5 @@
bool cmd_lsub(struct client_command_context *cmd)
{
- return _cmd_list_full(cmd, TRUE);
+ return cmd_list_full(cmd, TRUE);
}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-select.c
--- a/src/imap/cmd-select.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-select.c Sun Sep 16 12:43:21 2007 +0300
@@ -4,7 +4,7 @@
#include "commands.h"
#include "imap-sync.h"
-bool _cmd_select_full(struct client_command_context *cmd, bool readonly)
+bool cmd_select_full(struct client_command_context *cmd, bool readonly)
{
struct client *client = cmd->client;
struct mail_storage *storage;
@@ -84,5 +84,5 @@ bool _cmd_select_full(struct client_comm
bool cmd_select(struct client_command_context *cmd)
{
- return _cmd_select_full(cmd, FALSE);
+ return cmd_select_full(cmd, FALSE);
}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-subscribe.c
--- a/src/imap/cmd-subscribe.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-subscribe.c Sun Sep 16 12:43:21 2007 +0300
@@ -4,7 +4,7 @@
#include "commands.h"
#include "mail-namespace.h"
-bool _cmd_subscribe_full(struct client_command_context *cmd, bool subscribe)
+bool cmd_subscribe_full(struct client_command_context *cmd, bool subscribe)
{
struct mail_namespace *ns;
struct mail_storage *storage;
@@ -46,5 +46,5 @@ bool _cmd_subscribe_full(struct client_c
bool cmd_subscribe(struct client_command_context *cmd)
{
- return _cmd_subscribe_full(cmd, TRUE);
+ return cmd_subscribe_full(cmd, TRUE);
}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/cmd-unsubscribe.c
--- a/src/imap/cmd-unsubscribe.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/cmd-unsubscribe.c Sun Sep 16 12:43:21 2007 +0300
@@ -5,5 +5,5 @@
bool cmd_unsubscribe(struct client_command_context *cmd)
{
- return _cmd_subscribe_full(cmd, FALSE);
+ return cmd_subscribe_full(cmd, FALSE);
}
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/imap/commands.h
--- a/src/imap/commands.h Sun Sep 16 12:35:01 2007 +0300
+++ b/src/imap/commands.h Sun Sep 16 12:43:21 2007 +0300
@@ -86,8 +86,8 @@ bool cmd_x_cancel(struct client_command_
bool cmd_x_cancel(struct client_command_context *cmd);
/* private: */
-bool _cmd_list_full(struct client_command_context *cmd, bool lsub);
-bool _cmd_select_full(struct client_command_context *cmd, bool readonly);
-bool _cmd_subscribe_full(struct client_command_context *cmd, bool subscribe);
+bool cmd_list_full(struct client_command_context *cmd, bool lsub);
+bool cmd_select_full(struct client_command_context *cmd, bool readonly);
+bool cmd_subscribe_full(struct client_command_context *cmd, bool subscribe);
#endif
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/lib-imap/imap-parser.c
--- a/src/lib-imap/imap-parser.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/lib-imap/imap-parser.c Sun Sep 16 12:43:21 2007 +0300
@@ -624,7 +624,7 @@ const char *imap_arg_string(const struct
}
}
-char *_imap_arg_str_error(const struct imap_arg *arg)
+char *imap_arg_str_error(const struct imap_arg *arg)
{
i_panic("Tried to access imap_arg type %d as string", arg->type);
#ifndef ATTRS_DEFINED
@@ -632,7 +632,7 @@ char *_imap_arg_str_error(const struct i
#endif
}
-uoff_t _imap_arg_literal_size_error(const struct imap_arg *arg)
+uoff_t imap_arg_literal_size_error(const struct imap_arg *arg)
{
i_panic("Tried to access imap_arg type %d as literal size", arg->type);
#ifndef ATTRS_DEFINED
@@ -640,7 +640,7 @@ uoff_t _imap_arg_literal_size_error(cons
#endif
}
-ARRAY_TYPE(imap_arg_list) *_imap_arg_list_error(const struct imap_arg *arg)
+ARRAY_TYPE(imap_arg_list) *imap_arg_list_error(const struct imap_arg *arg)
{
i_panic("Tried to access imap_arg type %d as list", arg->type);
#ifndef ATTRS_DEFINED
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/lib-imap/imap-parser.h
--- a/src/lib-imap/imap-parser.h Sun Sep 16 12:35:01 2007 +0300
+++ b/src/lib-imap/imap-parser.h Sun Sep 16 12:43:21 2007 +0300
@@ -64,21 +64,21 @@ struct imap_arg {
#define IMAP_ARG_STR(arg) \
((arg)->type == IMAP_ARG_NIL ? NULL : \
IMAP_ARG_TYPE_IS_STRING((arg)->type) ? \
- (arg)->_data.str : _imap_arg_str_error(arg))
+ (arg)->_data.str : imap_arg_str_error(arg))
#define IMAP_ARG_STR_NONULL(arg) \
((arg)->type == IMAP_ARG_ATOM || (arg)->type == IMAP_ARG_STRING || \
(arg)->type == IMAP_ARG_LITERAL ? \
- (arg)->_data.str : _imap_arg_str_error(arg))
+ (arg)->_data.str : imap_arg_str_error(arg))
#define IMAP_ARG_LITERAL_SIZE(arg) \
(((arg)->type == IMAP_ARG_LITERAL_SIZE || \
(arg)->type == IMAP_ARG_LITERAL_SIZE_NONSYNC) ? \
- (arg)->_data.literal_size : _imap_arg_literal_size_error(arg))
+ (arg)->_data.literal_size : imap_arg_literal_size_error(arg))
#define IMAP_ARG_LIST(arg) \
((arg)->type == IMAP_ARG_LIST ? \
- &(arg)->_data.list : _imap_arg_list_error(arg))
+ &(arg)->_data.list : imap_arg_list_error(arg))
#define IMAP_ARG_LIST_ARGS(arg) \
array_idx(IMAP_ARG_LIST(arg), 0)
#define IMAP_ARG_LIST_COUNT(arg) \
@@ -134,10 +134,10 @@ const char *imap_arg_string(const struct
const char *imap_arg_string(const struct imap_arg *arg);
/* Error functions */
-char *_imap_arg_str_error(const struct imap_arg *arg) ATTR_NORETURN;
-uoff_t _imap_arg_literal_size_error(const struct imap_arg *arg)
+char *imap_arg_str_error(const struct imap_arg *arg) ATTR_NORETURN;
+uoff_t imap_arg_literal_size_error(const struct imap_arg *arg)
ATTR_NORETURN;
-ARRAY_TYPE(imap_arg_list) *_imap_arg_list_error(const struct imap_arg *arg)
+ARRAY_TYPE(imap_arg_list) *imap_arg_list_error(const struct imap_arg *arg)
ATTR_NORETURN;
#endif
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/lib/imem.c
--- a/src/lib/imem.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/lib/imem.c Sun Sep 16 12:43:21 2007 +0300
@@ -60,7 +60,7 @@ char *i_strconcat(const char *str1, ...)
va_start(args, str1);
t_push();
- temp = _vstrconcat(str1, args, &len);
+ temp = vstrconcat(str1, args, &len);
if (temp == NULL)
ret = NULL;
else {
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/lib/strfuncs.c
--- a/src/lib/strfuncs.c Sun Sep 16 12:35:01 2007 +0300
+++ b/src/lib/strfuncs.c Sun Sep 16 12:43:21 2007 +0300
@@ -147,7 +147,7 @@ char *p_strdup_vprintf(pool_t pool, cons
}
}
-char *_vstrconcat(const char *str1, va_list args, size_t *ret_len)
+char *vstrconcat(const char *str1, va_list args, size_t *ret_len)
{
const char *str;
char *temp;
@@ -194,7 +194,7 @@ char *p_strconcat(pool_t pool, const cha
if (!pool->datastack_pool)
t_push();
- temp = _vstrconcat(str1, args, &len);
More information about the dovecot-cvs
mailing list