dovecot: Get rid of __ prefixes.
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 13:53:12 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/8ebc07d2eee9
changeset: 6412:8ebc07d2eee9
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 11:45:24 2007 +0300
description:
Get rid of __ prefixes.
diffstat:
5 files changed, 18 insertions(+), 18 deletions(-)
src/lib-ntlm/ntlm-message.c | 4 ++--
src/lib-ntlm/ntlm.h | 16 ++++++++--------
src/lib-storage/index/maildir/maildir-sync-index.c | 4 ++--
src/lib-storage/index/mbox/mbox-sync.c | 8 ++++----
src/plugins/trash/trash-plugin.c | 4 ++--
diffs (134 lines):
diff -r 6a64e64fa3a3 -r 8ebc07d2eee9 src/lib-ntlm/ntlm-message.c
--- a/src/lib-ntlm/ntlm-message.c Sun Sep 16 11:40:56 2007 +0300
+++ b/src/lib-ntlm/ntlm-message.c Sun Sep 16 11:45:24 2007 +0300
@@ -18,8 +18,8 @@
#include <stdarg.h>
#include <ctype.h>
-const char * __ntlmssp_t_str(const void *message, struct ntlmssp_buffer *buffer,
- bool unicode)
+const char *ntlmssp_t_str_i(const void *message, struct ntlmssp_buffer *buffer,
+ bool unicode)
{
unsigned int len = read_le16(&buffer->length);
const char *p = ((const char *) message) + read_le32(&buffer->offset);
diff -r 6a64e64fa3a3 -r 8ebc07d2eee9 src/lib-ntlm/ntlm.h
--- a/src/lib-ntlm/ntlm.h Sun Sep 16 11:40:56 2007 +0300
+++ b/src/lib-ntlm/ntlm.h Sun Sep 16 11:45:24 2007 +0300
@@ -10,27 +10,27 @@
#include "ntlm-message.h"
#define ntlmssp_buffer_data(message, buffer) \
- __ntlmssp_buffer_data((message), &message->buffer)
+ ntlmssp_buffer_data_i((message), &message->buffer)
static inline const void *
-__ntlmssp_buffer_data(void * message, struct ntlmssp_buffer *buffer)
+ntlmssp_buffer_data_i(void *message, struct ntlmssp_buffer *buffer)
{
return ((char *) message) + read_le32(&buffer->offset);
}
#define ntlmssp_buffer_length(message, buffer) \
- __ntlmssp_buffer_length(&message->buffer)
+ ntlmssp_buffer_length_i(&message->buffer)
-static inline unsigned int __ntlmssp_buffer_length(struct ntlmssp_buffer *buffer)
+static inline unsigned int
+ntlmssp_buffer_length_i(struct ntlmssp_buffer *buffer)
{
return read_le16(&buffer->length);
}
#define ntlmssp_t_str(message, buffer, unicode) \
- __ntlmssp_t_str((message), &(message)->buffer, (unicode))
+ ntlmssp_t_str_i((message), &(message)->buffer, (unicode))
-const char * __ntlmssp_t_str(const void *message,
- struct ntlmssp_buffer *buffer,
- bool unicode);
+const char *ntlmssp_t_str_i(const void *message, struct ntlmssp_buffer *buffer,
+ bool unicode);
#endif
diff -r 6a64e64fa3a3 -r 8ebc07d2eee9 src/lib-storage/index/maildir/maildir-sync-index.c
--- a/src/lib-storage/index/maildir/maildir-sync-index.c Sun Sep 16 11:40:56 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-sync-index.c Sun Sep 16 11:45:24 2007 +0300
@@ -310,7 +310,7 @@ int maildir_sync_index(struct maildir_in
at all even for newly seen mails */
ctx->flags &= ~mbox->ibox.box.private_flags_mask;
- __again:
+ again:
ctx->seq = ++seq;
ctx->uid = uid;
@@ -350,7 +350,7 @@ int maildir_sync_index(struct maildir_in
if (uid > rec->uid) {
/* expunged */
mail_index_expunge(trans, seq);
- goto __again;
+ goto again;
}
if (uid < rec->uid) {
diff -r 6a64e64fa3a3 -r 8ebc07d2eee9 src/lib-storage/index/mbox/mbox-sync.c
--- a/src/lib-storage/index/mbox/mbox-sync.c Sun Sep 16 11:40:56 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync.c Sun Sep 16 11:45:24 2007 +0300
@@ -1583,7 +1583,7 @@ static int mbox_sync_int(struct mbox_mai
/* reopen input stream to make sure it has nothing buffered */
mbox_file_close_stream(mbox);
-__again:
+again:
if (changed) {
/* we're most likely modifying the mbox while syncing, just
lock it for writing immediately. the mbox must be locked
@@ -1637,7 +1637,7 @@ __again:
if (!changed && !mail_index_sync_have_more(index_sync_ctx)) {
/* nothing to do */
- __nothing_to_do:
+ nothing_to_do:
if (lock_id != 0)
(void)mbox_unlock(mbox, lock_id);
@@ -1690,7 +1690,7 @@ __again:
if (uid == 0) {
sync_ctx.index_sync_ctx = NULL;
mbox_sync_context_free(&sync_ctx);
- goto __nothing_to_do;
+ goto nothing_to_do;
}
}
@@ -1699,7 +1699,7 @@ __again:
restart syncing to avoid deadlocking. */
mbox_sync_context_free(&sync_ctx);
changed = 1;
- goto __again;
+ goto again;
}
if (mbox_file_open_stream(mbox) < 0) {
diff -r 6a64e64fa3a3 -r 8ebc07d2eee9 src/plugins/trash/trash-plugin.c
--- a/src/plugins/trash/trash-plugin.c Sun Sep 16 11:40:56 2007 +0300
+++ b/src/plugins/trash/trash-plugin.c Sun Sep 16 11:45:24 2007 +0300
@@ -136,7 +136,7 @@ static int trash_try_clean_mails(struct
ret = trash_clean_mailbox_get_next(&trashes[j],
&received);
if (ret < 0)
- goto __err;
+ goto err;
if (ret > 0) {
if (oldest == (time_t)-1 || received < oldest) {
oldest = received;
@@ -165,7 +165,7 @@ static int trash_try_clean_mails(struct
}
}
-__err:
+err:
for (i = 0; i < count; i++) {
struct trash_mailbox *trash = &trashes[i];
More information about the dovecot-cvs
mailing list