Return errors from constructors and destructors.

svn path=/trunk/libparserutils/; revision=5652

10 files changed, 30 insertions, 28 deletions

diff --git a/test/cscodec-8859.c b/test/cscodec-8859.c
index 6378cd4..75ce20e 100644
--- a/test/cscodec-8859.c
+++ b/test/cscodec-8859.c
@@ -40,6 +40,7 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 
 int main(int argc, char **argv)
 {
+	parserutils_charset_codec *codec;
 	line_ctx ctx;
 
 	if (argc != 3) {
@@ -51,7 +52,7 @@ int main(int argc, char **argv)
 			PARSERUTILS_OK);
 
 	assert(parserutils_charset_codec_create("NATS-SEFI-ADD",
-			myrealloc, NULL) == NULL);
+			myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING);
 
 	ctx.buflen = parse_filesize(argv[2]);
 	if (ctx.buflen == 0)
@@ -178,9 +179,9 @@ bool handle_line(const char *data, size_t datalen, void *pw)
 			memcpy(enc_name, enc, end - enc);
 			enc_name[end - enc] = 0;
 
-			ctx->codec = parserutils_charset_codec_create(enc_name,
-					myrealloc, NULL);
-			assert(ctx->codec != NULL);
+			assert(parserutils_charset_codec_create(enc_name,
+					myrealloc, NULL, &ctx->codec) ==
+					PARSERUTILS_OK);
 
 			ctx->hadenc = true;
 		}
diff --git a/test/cscodec-ext8.c b/test/cscodec-ext8.c
index 6378cd4..75ce20e 100644
--- a/test/cscodec-ext8.c
+++ b/test/cscodec-ext8.c
@@ -40,6 +40,7 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 
 int main(int argc, char **argv)
 {
+	parserutils_charset_codec *codec;
 	line_ctx ctx;
 
 	if (argc != 3) {
@@ -51,7 +52,7 @@ int main(int argc, char **argv)
 			PARSERUTILS_OK);
 
 	assert(parserutils_charset_codec_create("NATS-SEFI-ADD",
-			myrealloc, NULL) == NULL);
+			myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING);
 
 	ctx.buflen = parse_filesize(argv[2]);
 	if (ctx.buflen == 0)
@@ -178,9 +179,9 @@ bool handle_line(const char *data, size_t datalen, void *pw)
 			memcpy(enc_name, enc, end - enc);
 			enc_name[end - enc] = 0;
 
-			ctx->codec = parserutils_charset_codec_create(enc_name,
-					myrealloc, NULL);
-			assert(ctx->codec != NULL);
+			assert(parserutils_charset_codec_create(enc_name,
+					myrealloc, NULL, &ctx->codec) ==
+					PARSERUTILS_OK);
 
 			ctx->hadenc = true;
 		}
diff --git a/test/cscodec-utf16.c b/test/cscodec-utf16.c
index 25ebb8c..d61fd64 100644
--- a/test/cscodec-utf16.c
+++ b/test/cscodec-utf16.c
@@ -43,6 +43,7 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 
 int main(int argc, char **argv)
 {
+	parserutils_charset_codec *codec;
 	line_ctx ctx;
 
 	if (argc != 3) {
@@ -54,10 +55,10 @@ int main(int argc, char **argv)
 			PARSERUTILS_OK);
 
 	assert(parserutils_charset_codec_create("NATS-SEFI-ADD",
-			myrealloc, NULL) == NULL);
+			myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING);
 
-	ctx.codec = parserutils_charset_codec_create("UTF-16", myrealloc, NULL);
-	assert(ctx.codec != NULL);
+	assert(parserutils_charset_codec_create("UTF-16", myrealloc, NULL,
+			&ctx.codec) == PARSERUTILS_OK);
 
 	ctx.buflen = parse_filesize(argv[2]);
 	if (ctx.buflen == 0)
diff --git a/test/cscodec-utf8.c b/test/cscodec-utf8.c
index 5d0580b..85d0443 100644
--- a/test/cscodec-utf8.c
+++ b/test/cscodec-utf8.c
@@ -38,6 +38,7 @@ static void *myrealloc(void *ptr, size_t len, void *pw)
 
 int main(int argc, char **argv)
 {
+	parserutils_charset_codec *codec;
 	line_ctx ctx;
 
 	if (argc != 3) {
@@ -49,10 +50,10 @@ int main(int argc, char **argv)
 			PARSERUTILS_OK);
 
 	assert(parserutils_charset_codec_create("NATS-SEFI-ADD",
-			myrealloc, NULL) == NULL);
+			myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING);
 
-	ctx.codec = parserutils_charset_codec_create("UTF-8", myrealloc, NULL);
-	assert(ctx.codec != NULL);
+	assert(parserutils_charset_codec_create("UTF-8", myrealloc, NULL,
+			&ctx.codec) == PARSERUTILS_OK);
 
 	ctx.buflen = parse_filesize(argv[2]);
 	if (ctx.buflen == 0)
diff --git a/test/filter.c b/test/filter.c
index ff4d1e7..044a772 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -37,8 +37,8 @@ int main(int argc, char **argv)
 			PARSERUTILS_OK);
 
 	/* Create input filter */
-	input = parserutils_filter_create("UTF-8", myrealloc, NULL);
-	assert(input);
+	assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) ==
+			PARSERUTILS_OK);
 
 	/* Convert filter to UTF-8 encoding */
 	params.encoding.name = "UTF-8";
diff --git a/test/inputstream.c b/test/inputstream.c
index 5e4f134..33b163b 100644
--- a/test/inputstream.c
+++ b/test/inputstream.c
@@ -40,9 +40,8 @@ int main(int argc, char **argv)
 	assert(parserutils_initialise(argv[1], myrealloc, NULL) ==
 			PARSERUTILS_OK);
 
-	stream = parserutils_inputstream_create("UTF-8", 1, NULL,
-			myrealloc, NULL);
-	assert(stream != NULL);
+	assert(parserutils_inputstream_create("UTF-8", 1, NULL,
+			myrealloc, NULL, &stream) == PARSERUTILS_OK);
 
 	fp = fopen(argv[2], "rb");
 	if (fp == NULL) {
diff --git a/test/rbtree.c b/test/rbtree.c
index a28bcfb..ac27964 100644
--- a/test/rbtree.c
+++ b/test/rbtree.c
@@ -25,8 +25,8 @@ int main(int argc, char **argv)
 	UNUSED(argc);
 	UNUSED(argv);
 
-	tree = parserutils_rbtree_create(mycmp, myrealloc, NULL);
-	assert(tree != NULL);
+	assert(parserutils_rbtree_create(mycmp, myrealloc, NULL, &tree) ==
+		PARSERUTILS_OK);
 
 #define N 40000
 #define G 307
diff --git a/test/regression/cscodec-segv.c b/test/regression/cscodec-segv.c
index 5802fdf..0cf9f69 100644
--- a/test/regression/cscodec-segv.c
+++ b/test/regression/cscodec-segv.c
@@ -24,8 +24,8 @@ int main(int argc, char **argv)
 	assert(parserutils_charset_initialise(argv[1], myrealloc, NULL) == 
 			PARSERUTILS_OK);
 
-	codec = parserutils_charset_codec_create("UTF-8", myrealloc, NULL);
-	assert(codec != NULL);
+	assert(parserutils_charset_codec_create("UTF-8", myrealloc, NULL,
+			&codec) == PARSERUTILS_OK);
 
 	parserutils_charset_codec_destroy(codec);
 
diff --git a/test/regression/filter-segv.c b/test/regression/filter-segv.c
index 761caab..a884b6d 100644
--- a/test/regression/filter-segv.c
+++ b/test/regression/filter-segv.c
@@ -26,8 +26,8 @@ int main(int argc, char **argv)
 	assert(parserutils_initialise(argv[1], myrealloc, NULL) == 
 			PARSERUTILS_OK);
 
-	input = parserutils_filter_create("UTF-8", myrealloc, NULL);
-	assert(input);
+	assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) ==
+			PARSERUTILS_OK);
 
 	parserutils_filter_destroy(input);
 
diff --git a/test/regression/stream-nomem.c b/test/regression/stream-nomem.c
index f62b392..004a807 100644
--- a/test/regression/stream-nomem.c
+++ b/test/regression/stream-nomem.c
@@ -52,9 +52,8 @@ int main(int argc, char **argv)
 	assert(parserutils_initialise(argv[1], myrealloc, NULL) == 
 			PARSERUTILS_OK);
 
-	stream = parserutils_inputstream_create("UTF-8", 0, 
-			NULL, myrealloc, NULL);
-	assert(stream != NULL);
+	assert(parserutils_inputstream_create("UTF-8", 0, 
+			NULL, myrealloc, NULL, &stream) == PARSERUTILS_OK);
 
 	assert(parserutils_inputstream_append(stream, 
 			input_buffer, BUFFER_SIZE) == PARSERUTILS_OK);