From 1245cf0cf43c9fd1a543ef92364a736f0b8e2041 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Mon, 2 Aug 2010 15:19:05 +0200
Subject: [PATCH] Testsuite: minor cleanups.
---
src/testsuite/testsuite.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 51a60611d..27df768f4 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -84,7 +84,6 @@ int main(int argc, char **argv)
struct sieve_instance *svinst;
const char *scriptfile, *dumpfile, *tracefile;
struct sieve_trace_config tr_config;
- struct ostream *tracestream = NULL;
struct sieve_binary *sbin;
const char *sieve_dir;
bool log_stdout = FALSE;
@@ -166,16 +165,17 @@ int main(int argc, char **argv)
/* Compile sieve script */
if ( (sbin = sieve_tool_script_compile(svinst, scriptfile, NULL)) != NULL ) {
struct sieve_error_handler *ehandler;
+ struct ostream *tracestream = NULL;
struct sieve_script_env scriptenv;
/* Dump script */
sieve_tool_dump_binary_to(sbin, dumpfile);
-
- testsuite_mailstore_init();
- testsuite_message_init();
if ( tracefile != NULL )
- tracestream = sieve_tool_open_output_stream(tracefile);
+ tracestream = sieve_tool_open_output_stream(tracefile);
+
+ testsuite_mailstore_init();
+ testsuite_message_init();
memset(&scriptenv, 0, sizeof(scriptenv));
scriptenv.user = sieve_tool_get_mail_user(sieve_tool);
@@ -213,19 +213,20 @@ int main(int argc, char **argv)
sieve_close(&sbin);
- if ( scriptenv.trace_stream != NULL )
- o_stream_unref(&scriptenv.trace_stream);
-
/* De-initialize message environment */
testsuite_message_deinit();
testsuite_mailstore_deinit();
testsuite_result_deinit();
+
+ if ( tracestream != NULL )
+ o_stream_unref(&tracestream);
+
} else {
testsuite_testcase_fail("failed to compile testcase script");
}
/* De-initialize testsuite */
- testsuite_deinit();
+ testsuite_deinit();
testsuite_settings_deinit();
sieve_tool_deinit(&sieve_tool);
--
GitLab