dovecot-2.2-pigeonhole: Adjusted to Dovecot API changes.
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Fri Jul 13 00:40:59 EEST 2012
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/f9b7eb9a567e
changeset: 1631:f9b7eb9a567e
user: Stephan Bosch <stephan at rename-it.nl>
date: Thu Jul 12 23:40:52 2012 +0200
description:
Adjusted to Dovecot API changes.
diffstat:
src/lib-managesieve/managesieve-parser.c | 2 +-
src/lib-sieve-tool/mail-raw.c | 3 +--
src/lib-sieve/edit-mail.c | 8 +++-----
3 files changed, 5 insertions(+), 8 deletions(-)
diffs (50 lines):
diff -r 258d83f111b9 -r f9b7eb9a567e src/lib-managesieve/managesieve-parser.c
--- a/src/lib-managesieve/managesieve-parser.c Sun May 20 12:16:43 2012 +0200
+++ b/src/lib-managesieve/managesieve-parser.c Thu Jul 12 23:40:52 2012 +0200
@@ -648,7 +648,7 @@
}
/* Allocate buffer space */
- if (!i_stream_get_buffer_space(stream, size, NULL))
+ if (!i_stream_try_alloc(stream, size, NULL))
return -2;
/* Parse quoted string content */
diff -r 258d83f111b9 -r f9b7eb9a567e src/lib-sieve-tool/mail-raw.c
--- a/src/lib-sieve-tool/mail-raw.c Sun May 20 12:16:43 2012 +0200
+++ b/src/lib-sieve-tool/mail-raw.c Thu Jul 12 23:40:52 2012 +0200
@@ -9,7 +9,6 @@
#include "str-sanitize.h"
#include "strescape.h"
#include "safe-mkstemp.h"
-#include "close-keep-errno.h"
#include "mkdir-parents.h"
#include "abspath.h"
#include "message-address.h"
@@ -88,7 +87,7 @@
if (unlink(str_c(path)) < 0) {
/* shouldn't happen.. */
i_error("unlink(%s) failed: %m", str_c(path));
- close_keep_errno(fd);
+ i_close_fd(&fd);
return -1;
}
diff -r 258d83f111b9 -r f9b7eb9a567e src/lib-sieve/edit-mail.c
--- a/src/lib-sieve/edit-mail.c Sun May 20 12:16:43 2012 +0200
+++ b/src/lib-sieve/edit-mail.c Thu Jul 12 23:40:52 2012 +0200
@@ -534,11 +534,9 @@
/* hdr_data is already unfolded */
/* Decode MIME encoded-words. */
- if ( message_header_decode_utf8
- ((const unsigned char *)hdr_data, hdr_data_len, str, FALSE))
- return i_strdup(str_c(str));
-
- return i_strndup(hdr_data, hdr_data_len);
+ message_header_decode_utf8
+ ((const unsigned char *)hdr_data, hdr_data_len, str, FALSE);
+ return i_strdup(str_c(str));
}
static int edit_mail_headers_parse
More information about the dovecot-cvs
mailing list