# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1189935801 -10800
# Node ID 46d9ee79f2926fa94127fe9b213e57e48819af89
# Parent  047d0d8bbf0aa18af0f7ad3b7ea3766d648a3bcf
Removed _ prefix from all public APIs.

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 @@
 	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);
+	o_stream_set_flush_callback(client->output, client_output, client);
 
-	client->io = io_add(fd_in, IO_READ, _client_input, 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 @@
 {
 	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 @@
 	/* 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 @@
 	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 @@
 	}
 }
 
-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_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(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 @@
 	/* 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 @@
 
 	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 @@
 	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(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(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(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_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 @@
 	}
 }
 
-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 @@
 #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 @@
 #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 @@
 #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 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 @@
 	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 *_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 @@
 	if (!pool->datastack_pool)
 		t_push();
 
-	temp = _vstrconcat(str1, args, &len);
+	temp = vstrconcat(str1, args, &len);
 	if (temp == NULL)
 		ret = NULL;
 	else {
@@ -264,7 +264,7 @@
 
 	va_start(args, str1);
 
-	ret = _vstrconcat(str1, args, &len);
+	ret = vstrconcat(str1, args, &len);
 	if (ret != NULL)
 		t_buffer_alloc(len);
 
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/lib/strfuncs.h
--- a/src/lib/strfuncs.h	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/lib/strfuncs.h	Sun Sep 16 12:43:21 2007 +0300
@@ -94,7 +94,6 @@
 /* INTERNAL */
 char *t_noalloc_strdup_vprintf(const char *format, va_list args,
 			       unsigned int *size_r);
-char *_vstrconcat(const char *str1, va_list args, size_t *ret_len)
-	ATTR_MALLOC;
+char *vstrconcat(const char *str1, va_list args, size_t *ret_len) ATTR_MALLOC;
 
 #endif
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/master/ssl-init-gnutls.c
--- a/src/master/ssl-init-gnutls.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/master/ssl-init-gnutls.c	Sun Sep 16 12:43:21 2007 +0300
@@ -68,7 +68,7 @@
 	write_datum(fd, fname, &u);
 }
 
-void _ssl_generate_parameters(int fd, const char *fname)
+void ssl_generate_parameters(int fd, const char *fname)
 {
 	int ret;
 
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/master/ssl-init-main.c
--- a/src/master/ssl-init-main.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/master/ssl-init-main.c	Sun Sep 16 12:43:21 2007 +0300
@@ -43,7 +43,7 @@
 	if (ftruncate(fd, 0) < 0)
 		i_fatal("ftruncate(%s) failed: %m", temp_fname);
 
-	_ssl_generate_parameters(fd, temp_fname);
+	ssl_generate_parameters(fd, temp_fname);
 
 	if (rename(temp_fname, fname) < 0)
 		i_fatal("rename(%s, %s) failed: %m", temp_fname, fname);
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/master/ssl-init-openssl.c
--- a/src/master/ssl-init-openssl.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/master/ssl-init-openssl.c	Sun Sep 16 12:43:21 2007 +0300
@@ -58,7 +58,7 @@
 	i_free(buf);
 }
 
-void _ssl_generate_parameters(int fd, const char *fname)
+void ssl_generate_parameters(int fd, const char *fname)
 {
 	unsigned int i;
 	int bits;
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/master/ssl-init.h
--- a/src/master/ssl-init.h	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/master/ssl-init.h	Sun Sep 16 12:43:21 2007 +0300
@@ -4,7 +4,7 @@
 #define SSL_PARAMETERS_FILENAME "ssl-parameters.dat"
 
 void ssl_check_parameters_file(void);
-void _ssl_generate_parameters(int fd, const char *fname);
+void ssl_generate_parameters(int fd, const char *fname);
 
 void ssl_init(void);
 void ssl_deinit(void);
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/plugins/fts-squat/squat-test.c
--- a/src/plugins/fts-squat/squat-test.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/plugins/fts-squat/squat-test.c	Sun Sep 16 12:43:21 2007 +0300
@@ -88,7 +88,7 @@
 		input->v_offset / cputime / (1024*1024));
 
 	mem = squat_trie_mem_used(trie, &leaves);
-	uid_lists_mem = squat_uidlist_mem_used(_squat_trie_get_uidlist(trie),
+	uid_lists_mem = squat_uidlist_mem_used(squat_trie_get_uidlist(trie),
 					       &uid_lists_count);
 	fprintf(stderr, " - %u bytes in %u nodes (%.02f%%)\n"
 		" - %u bytes in %u uid_lists (%.02f%%)\n"
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/plugins/fts-squat/squat-trie.c
--- a/src/plugins/fts-squat/squat-trie.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/plugins/fts-squat/squat-trie.c	Sun Sep 16 12:43:21 2007 +0300
@@ -162,7 +162,7 @@
 	return *key - *chr;
 }
 
-void _squat_trie_pack_num(buffer_t *buffer, uint32_t num)
+void squat_trie_pack_num(buffer_t *buffer, uint32_t num)
 {
 	uint8_t c;
 
@@ -178,7 +178,7 @@
 	buffer_append(buffer, &c, 1);
 }
 
-uint32_t _squat_trie_unpack_num(const uint8_t **p, const uint8_t *end)
+uint32_t squat_trie_unpack_num(const uint8_t **p, const uint8_t *end)
 {
 	const uint8_t *c = *p;
 	uint32_t value = 0;
@@ -375,7 +375,7 @@
 	end = trie->const_mmap_base + trie->mmap_size;
 
 	/* get 8bit char count and check that it's valid */
-	num = _squat_trie_unpack_num(&p, end);
+	num = squat_trie_unpack_num(&p, end);
 	chars8_count = num >> 1;
 
 	chars8_offset = p - trie->const_mmap_base;
@@ -408,7 +408,7 @@
 		p = trie->const_mmap_base + chars8_offset + chars8_size;
 		end = trie->const_mmap_base + trie->mmap_size;
 
-		chars16_count = _squat_trie_unpack_num(&p, end);
+		chars16_count = squat_trie_unpack_num(&p, end);
 		if (chars16_count > 65536) {
 			squat_trie_set_corrupted(trie, "trie offset broken");
 			return -1;
@@ -1329,13 +1329,13 @@
 	struct trie_node **children16 = NODE_CHILDREN16(node, 0);
 
 	buffer_set_used_size(buf, 0);
-	_squat_trie_pack_num(buf, (node->chars_8bit_count << 1) |
-			     (node->chars_16bit_count > 0 ? 1 : 0));
+	squat_trie_pack_num(buf, (node->chars_8bit_count << 1) |
+			    (node->chars_16bit_count > 0 ? 1 : 0));
 	buffer_append(buf, chars8, node->chars_8bit_count);
 	node_pack_children(buf, children8, node->chars_8bit_count);
 
 	if (node->chars_16bit_count > 0) {
-		_squat_trie_pack_num(buf, node->chars_16bit_count);
+		squat_trie_pack_num(buf, node->chars_16bit_count);
 		buffer_append(buf, chars16,
 			      sizeof(*chars16) * node->chars_16bit_count);
 		node_pack_children(buf, children16, node->chars_16bit_count);
@@ -1367,13 +1367,13 @@
 	uint32_t *idx16 = (uint32_t *)NODE_CHILDREN16(node, BLOCK_SIZE);
 
 	buffer_set_used_size(buf, 0);
-	_squat_trie_pack_num(buf, (node->chars_8bit_count << 1) |
-			     (node->chars_16bit_count > 0 ? 1 : 0));
+	squat_trie_pack_num(buf, (node->chars_8bit_count << 1) |
+			    (node->chars_16bit_count > 0 ? 1 : 0));
 	buffer_append(buf, chars8, node->chars_8bit_count);
 	buffer_append(buf, idx8, sizeof(*idx8) * node->chars_8bit_count);
 
 	if (node->chars_16bit_count > 0) {
-		_squat_trie_pack_num(buf, node->chars_16bit_count);
+		squat_trie_pack_num(buf, node->chars_16bit_count);
 		buffer_append(buf, chars16,
 			      sizeof(*chars16) * node->chars_16bit_count);
 		buffer_append(buf, idx16,
@@ -2025,7 +2025,7 @@
 	return ret;
 }
 
-struct squat_uidlist *_squat_trie_get_uidlist(struct squat_trie *trie)
+struct squat_uidlist *squat_trie_get_uidlist(struct squat_trie *trie)
 {
 	return trie->uidlist;
 }
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/plugins/fts-squat/squat-trie.h
--- a/src/plugins/fts-squat/squat-trie.h	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/plugins/fts-squat/squat-trie.h	Sun Sep 16 12:43:21 2007 +0300
@@ -35,10 +35,10 @@
 
 size_t squat_trie_mem_used(struct squat_trie *trie, unsigned int *count_r);
 
-struct squat_uidlist *_squat_trie_get_uidlist(struct squat_trie *trie);
+struct squat_uidlist *squat_trie_get_uidlist(struct squat_trie *trie);
 
-void _squat_trie_pack_num(buffer_t *buffer, uint32_t num);
-uint32_t _squat_trie_unpack_num(const uint8_t **p, const uint8_t *end);
+void squat_trie_pack_num(buffer_t *buffer, uint32_t num);
+uint32_t squat_trie_unpack_num(const uint8_t **p, const uint8_t *end);
 
 void squat_trie_set_corrupted(struct squat_trie *trie, const char *reason);
 
diff -r 047d0d8bbf0a -r 46d9ee79f292 src/plugins/fts-squat/squat-uidlist.c
--- a/src/plugins/fts-squat/squat-uidlist.c	Sun Sep 16 12:35:01 2007 +0300
+++ b/src/plugins/fts-squat/squat-uidlist.c	Sun Sep 16 12:43:21 2007 +0300
@@ -443,7 +443,7 @@
 	data = uidlist->const_mmap_base + offset;
 	end = uidlist->const_mmap_base + uidlist->mmap_size;
 
-	size = _squat_trie_unpack_num(&data, end);
+	size = squat_trie_unpack_num(&data, end);
 	data_offset = data - uidlist->const_mmap_base;
 
 	if (squat_uidlist_map_area(uidlist, data_offset, size) < 0)
@@ -469,10 +469,10 @@
 	data_start = data;
 	end = data + size;
 
-	prev_uid = next_uid = _squat_trie_unpack_num(&data, end);
+	prev_uid = next_uid = squat_trie_unpack_num(&data, end);
 	p = data;
 	while (data != end) {
-		num = _squat_trie_unpack_num(&data, end);
+		num = squat_trie_unpack_num(&data, end);
 		next_uid = prev_uid + (num >> 1) + 1;
 
 		if ((num & 1) != 0) {
@@ -483,7 +483,7 @@
 			}
 
 			/* beginning a new uid/range */
-			num = _squat_trie_unpack_num(&data, end);
+			num = squat_trie_unpack_num(&data, end);
 			next_uid += num + 1;
 
 			prev_uid = next_uid;
@@ -518,7 +518,7 @@
 
 	if (node->prev == NULL) {
 		/* first UID */
-		_squat_trie_pack_num(buffer, node->uid);
+		squat_trie_pack_num(buffer, node->uid);
 	} else {
 		if ((prev_idx & UID_NODE_PREV_FLAG_OLD) != 0) {
 			prev_idx >>= 1;
@@ -546,7 +546,7 @@
 				return 0;
 			} else {
 				/* finishing range */
-				_squat_trie_pack_num(buffer, 1 |
+				squat_trie_pack_num(buffer, 1 |
 					((node->uid - written_uid - 1) << 1));
 				return 0;
 			}
@@ -556,13 +556,13 @@
 			i_assert(written_uid < prev_uid);
 
 			/* range ends at prev_uid */
-			_squat_trie_pack_num(buffer, 1 |
+			squat_trie_pack_num(buffer, 1 |
 				((prev_uid - written_uid - 1) << 1));
 			/* next uid/range */
-			_squat_trie_pack_num(buffer, node->uid - prev_uid - 1);
+			squat_trie_pack_num(buffer, node->uid - prev_uid - 1);
 		} else {
 			/* no range */
-			_squat_trie_pack_num(buffer,
+			squat_trie_pack_num(buffer,
 					     ((node->uid - prev_uid - 1) << 1));
 		}
 	}
@@ -600,7 +600,7 @@
 {
 	/* write size + buffer */
 	buffer_set_used_size(uidlist->tmp_buf, 0);
-	_squat_trie_pack_num(uidlist->tmp_buf, uidlist->list_buf->used);
+	squat_trie_pack_num(uidlist->tmp_buf, uidlist->list_buf->used);
 
 	if (o_stream_send(output, uidlist->tmp_buf->data,
 			  uidlist->tmp_buf->used) < 0 ||
@@ -818,11 +818,11 @@
 	ctx->seen_expunged = FALSE;
 	ctx->last_node = NULL;
 
-	prev_uid = _squat_trie_unpack_num(&data, end);
+	prev_uid = squat_trie_unpack_num(&data, end);
 	squat_uidlist_compress_add_uid(ctx, prev_uid);
 
 	while (data != end) {
-		num = _squat_trie_unpack_num(&data, end);
+		num = squat_trie_unpack_num(&data, end);
 		next_uid = prev_uid + (num >> 1) + 1;
 		if ((num & 1) != 0) {
 			for (prev_uid++; prev_uid <= next_uid; prev_uid++)
@@ -830,7 +830,7 @@
 
 			if (data == end)
 				break;
-			num = _squat_trie_unpack_num(&data, end);
+			num = squat_trie_unpack_num(&data, end);
 			next_uid += num + 1;
 		}
 		squat_uidlist_compress_add_uid(ctx, next_uid);
@@ -905,7 +905,7 @@
 
 	if (ret == 0) {
 		data_start = data = uidlist->const_mmap_base + old_offset;
-		(void)_squat_trie_unpack_num(&data, NULL);
+		(void)squat_trie_unpack_num(&data, NULL);
 
 		if (o_stream_send(ctx->output, data_start,
 				  data - data_start + size) < 0) {
@@ -1006,11 +1006,11 @@
 		return -1;
 	end = data + size;
 
-	prev_uid = _squat_trie_unpack_num(&data, end);
+	prev_uid = squat_trie_unpack_num(&data, end);
 	squat_uidlist_get_add_uid(ctx, prev_uid);
 
 	while (data != end) {
-		num = _squat_trie_unpack_num(&data, end);
+		num = squat_trie_unpack_num(&data, end);
 		next_uid = prev_uid + (num >> 1) + 1;
 		if ((num & 1) != 0) {
 			for (prev_uid++; prev_uid <= next_uid; prev_uid++)
@@ -1018,7 +1018,7 @@
 
 			if (data == end)
 				break;
-			num = _squat_trie_unpack_num(&data, end);
+			num = squat_trie_unpack_num(&data, end);
 			next_uid += num + 1;
 		}
 		squat_uidlist_get_add_uid(ctx, next_uid);