From 7d0269d2cec68c7e55df5b6db3d2266741534b17 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 5 Sep 2013 00:06:31 +0200 Subject: InputLegacy: move functions to the input_stream class --- test/dump_text_file.cxx | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'test/dump_text_file.cxx') diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index a9f8c95a2..11ac8b3d0 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -59,34 +59,35 @@ dump_input_stream(struct input_stream *is) { Error error; - input_stream_lock(is); + is->Lock(); /* wait until the stream becomes ready */ - input_stream_wait_ready(is); + is->WaitReady(); - if (!input_stream_check(is, error)) { + if (!is->Check(error)) { g_warning("%s", error.GetMessage()); - input_stream_unlock(is); + is->Unlock(); return EXIT_FAILURE; } /* read data and tags from the stream */ - input_stream_unlock(is); + is->Unlock(); { TextInputStream tis(is); dump_text_file(tis); } - input_stream_lock(is); - if (!input_stream_check(is, error)) { + is->Lock(); + + if (!is->Check(error)) { g_warning("%s", error.GetMessage()); - input_stream_unlock(is); + is->Unlock(); return EXIT_FAILURE; } - input_stream_unlock(is); + is->Unlock(); return 0; } @@ -131,15 +132,15 @@ int main(int argc, char **argv) Mutex mutex; Cond cond; - is = input_stream_open(argv[1], mutex, cond, error); + is = input_stream::Open(argv[1], mutex, cond, error); if (is != NULL) { ret = dump_input_stream(is); - input_stream_close(is); + is->Close(); } else { if (error.IsDefined()) g_warning("%s", error.GetMessage()); else - g_printerr("input_stream_open() failed\n"); + g_printerr("input_stream::Open() failed\n"); ret = 2; } -- cgit v1.2.3