From 8e48b931091cbc99abeffacc7af80f363495ec23 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 14 Dec 2013 23:14:09 +0000 Subject: Remove client allocation function. --- test/cscodec-8859.c | 12 ++---------- test/cscodec-ext8.c | 12 ++---------- test/cscodec-utf16.c | 11 ++--------- test/cscodec-utf8.c | 11 ++--------- test/filter.c | 10 +--------- test/inputstream.c | 9 +-------- test/regression/filter-badenc-segv.c | 10 +--------- test/regression/filter-segv.c | 10 +--------- test/regression/stream-nomem.c | 9 +-------- 9 files changed, 13 insertions(+), 81 deletions(-) (limited to 'test') diff --git a/test/cscodec-8859.c b/test/cscodec-8859.c index d47fb2a..2f7448d 100644 --- a/test/cscodec-8859.c +++ b/test/cscodec-8859.c @@ -30,13 +30,6 @@ typedef struct line_ctx { static bool handle_line(const char *data, size_t datalen, void *pw); static void run_test(line_ctx *ctx); -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_charset_codec *codec; @@ -48,7 +41,7 @@ int main(int argc, char **argv) } assert(parserutils_charset_codec_create("NATS-SEFI-ADD", - myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING); + &codec) == PARSERUTILS_BADENCODING); ctx.buflen = parse_filesize(argv[1]); if (ctx.buflen == 0) @@ -174,8 +167,7 @@ bool handle_line(const char *data, size_t datalen, void *pw) enc_name[end - enc] = 0; assert(parserutils_charset_codec_create(enc_name, - myrealloc, NULL, &ctx->codec) == - PARSERUTILS_OK); + &ctx->codec) == PARSERUTILS_OK); ctx->hadenc = true; diff --git a/test/cscodec-ext8.c b/test/cscodec-ext8.c index d47fb2a..2f7448d 100644 --- a/test/cscodec-ext8.c +++ b/test/cscodec-ext8.c @@ -30,13 +30,6 @@ typedef struct line_ctx { static bool handle_line(const char *data, size_t datalen, void *pw); static void run_test(line_ctx *ctx); -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_charset_codec *codec; @@ -48,7 +41,7 @@ int main(int argc, char **argv) } assert(parserutils_charset_codec_create("NATS-SEFI-ADD", - myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING); + &codec) == PARSERUTILS_BADENCODING); ctx.buflen = parse_filesize(argv[1]); if (ctx.buflen == 0) @@ -174,8 +167,7 @@ bool handle_line(const char *data, size_t datalen, void *pw) enc_name[end - enc] = 0; assert(parserutils_charset_codec_create(enc_name, - myrealloc, NULL, &ctx->codec) == - PARSERUTILS_OK); + &ctx->codec) == PARSERUTILS_OK); ctx->hadenc = true; diff --git a/test/cscodec-utf16.c b/test/cscodec-utf16.c index f29e4d1..835c65e 100644 --- a/test/cscodec-utf16.c +++ b/test/cscodec-utf16.c @@ -33,13 +33,6 @@ typedef struct line_ctx { static bool handle_line(const char *data, size_t datalen, void *pw); static void run_test(line_ctx *ctx); -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_charset_codec *codec; @@ -51,9 +44,9 @@ int main(int argc, char **argv) } assert(parserutils_charset_codec_create("NATS-SEFI-ADD", - myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING); + &codec) == PARSERUTILS_BADENCODING); - assert(parserutils_charset_codec_create("UTF-16", myrealloc, NULL, + assert(parserutils_charset_codec_create("UTF-16", &ctx.codec) == PARSERUTILS_OK); ctx.buflen = parse_filesize(argv[1]); diff --git a/test/cscodec-utf8.c b/test/cscodec-utf8.c index 6b1d4de..daf8035 100644 --- a/test/cscodec-utf8.c +++ b/test/cscodec-utf8.c @@ -28,13 +28,6 @@ typedef struct line_ctx { static bool handle_line(const char *data, size_t datalen, void *pw); static void run_test(line_ctx *ctx); -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_charset_codec *codec; @@ -46,9 +39,9 @@ int main(int argc, char **argv) } assert(parserutils_charset_codec_create("NATS-SEFI-ADD", - myrealloc, NULL, &codec) == PARSERUTILS_BADENCODING); + &codec) == PARSERUTILS_BADENCODING); - assert(parserutils_charset_codec_create("UTF-8", myrealloc, NULL, + assert(parserutils_charset_codec_create("UTF-8", &ctx.codec) == PARSERUTILS_OK); ctx.buflen = parse_filesize(argv[1]); diff --git a/test/filter.c b/test/filter.c index a34ade3..25c94a9 100644 --- a/test/filter.c +++ b/test/filter.c @@ -11,13 +11,6 @@ #include "testutils.h" -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_filter_optparams params; @@ -31,8 +24,7 @@ int main(int argc, char **argv) UNUSED(argv); /* Create input filter */ - assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) == - PARSERUTILS_OK); + assert(parserutils__filter_create("UTF-8", &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 d8c6454..91694b0 100644 --- a/test/inputstream.c +++ b/test/inputstream.c @@ -14,13 +14,6 @@ const char * const __dynamic_da_name = "InputStream"; int __dynamic_da_max_size = 128*1024*1024; #endif -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_inputstream *stream; @@ -37,7 +30,7 @@ int main(int argc, char **argv) } assert(parserutils_inputstream_create("UTF-8", 1, NULL, - myrealloc, NULL, &stream) == PARSERUTILS_OK); + &stream) == PARSERUTILS_OK); fp = fopen(argv[1], "rb"); if (fp == NULL) { diff --git a/test/regression/filter-badenc-segv.c b/test/regression/filter-badenc-segv.c index f44ac59..2581f7a 100644 --- a/test/regression/filter-badenc-segv.c +++ b/test/regression/filter-badenc-segv.c @@ -7,13 +7,6 @@ #include "testutils.h" -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_filter *input; @@ -29,8 +22,7 @@ int main(int argc, char **argv) UNUSED(argc); UNUSED(argv); - assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) == - PARSERUTILS_OK); + assert(parserutils__filter_create("UTF-8", &input) == PARSERUTILS_OK); params.encoding.name = "GBK"; assert(parserutils__filter_setopt(input, diff --git a/test/regression/filter-segv.c b/test/regression/filter-segv.c index 364d8b1..59960e9 100644 --- a/test/regression/filter-segv.c +++ b/test/regression/filter-segv.c @@ -7,13 +7,6 @@ #include "testutils.h" -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_filter *input; @@ -21,8 +14,7 @@ int main(int argc, char **argv) UNUSED(argc); UNUSED(argv); - assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) == - PARSERUTILS_OK); + assert(parserutils__filter_create("UTF-8", &input) == PARSERUTILS_OK); parserutils__filter_destroy(input); diff --git a/test/regression/stream-nomem.c b/test/regression/stream-nomem.c index 4545bea..32aee2b 100644 --- a/test/regression/stream-nomem.c +++ b/test/regression/stream-nomem.c @@ -8,13 +8,6 @@ #include "testutils.h" -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - int main(int argc, char **argv) { parserutils_inputstream *stream; @@ -48,7 +41,7 @@ int main(int argc, char **argv) input_buffer[BUFFER_SIZE - 8] = '1'; assert(parserutils_inputstream_create("UTF-8", 0, - NULL, myrealloc, NULL, &stream) == PARSERUTILS_OK); + NULL, &stream) == PARSERUTILS_OK); assert(parserutils_inputstream_append(stream, input_buffer, BUFFER_SIZE) == PARSERUTILS_OK); -- cgit v1.2.3