From c0e64243f9069e13dc0504046c71846cd3f3b9de Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 24 Jul 2008 17:48:56 +0200
Subject: [PATCH] Started using new str_new_const() function.
---
README | 2 +-
TODO | 1 -
configure.in | 2 +-
src/lib-sieve/sieve-binary.c | 13 ++++---------
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/README b/README
index c3ce15ffe..0a0a3accd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Sieve implementation for Dovecot (1.1)
+Sieve implementation for Dovecot (1.2)
################################################################################
!! WARNING !!
diff --git a/TODO b/TODO
index 5f8352620..3b5e234e5 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
Next (in order of descending priority/precedence):
* Review sieve-address parsing implementation for past-end checks
* Improve handling of old/corrupt binaries.
-* Move to 1.2 and start using and new const str.
* Resolve problems in variables extension: scope uses hash the wrong way and
extension ids are emitted directly.
diff --git a/configure.in b/configure.in
index 7a1e69012..d2e04a049 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([dovecot-sieve], [0.0.0], [dovecot@dovecot.org], [dovecot-1.1-sieve])
+AC_INIT([dovecot-sieve], [0.0.0], [dovecot@dovecot.org], [dovecot-1.2-sieve])
AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([dsieve-config.h])
diff --git a/src/lib-sieve/sieve-binary.c b/src/lib-sieve/sieve-binary.c
index 760c222d8..5738a7a0f 100644
--- a/src/lib-sieve/sieve-binary.c
+++ b/src/lib-sieve/sieve-binary.c
@@ -1622,15 +1622,10 @@ bool sieve_binary_read_integer
return TRUE;
}
-/* FIXME: add this to lib/str. (now commented out) */
-static string_t *t_str_const(const void *cdata, size_t size)
+/* FIXME: add this to lib/str. */
+static string_t *t_str_new_const(const char *str, size_t len)
{
- string_t *result = t_str_new(size);
-
- str_append_n(result, cdata, size);
-
- return result;
- //return buffer_create_const_data(pool_datastack_create(), cdata, size);
+ return str_new_const(pool_datastack_create(), str, len);
}
bool sieve_binary_read_string
@@ -1645,7 +1640,7 @@ bool sieve_binary_read_string
return FALSE;
if ( str != NULL )
- *str = t_str_const(&ADDR_CODE_AT(binary, address), strlen);
+ *str = t_str_new_const(&ADDR_CODE_AT(binary, address), strlen);
ADDR_JUMP(address, strlen);
if ( ADDR_CODE_AT(binary, address) != 0 )
--
GitLab