oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/read_tags: use AtScopeExit()

Browse Source
This commit is contained in:
Max Kellermann 2016-12-09 23:49:16 +01:00
parent 30bd190b41
commit 48089394a5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/read_tags.cxx
View File

@ -29,6 +29,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "util/ScopeExit.hxx"
#include <stdexcept> #include <stdexcept>
@ -89,7 +90,10 @@ try {
const ScopeIOThread io_thread; const ScopeIOThread io_thread;
input_stream_global_init(); input_stream_global_init();
AtScopeExit() { input_stream_global_finish(); };
decoder_plugin_init_all(); decoder_plugin_init_all();
AtScopeExit() { decoder_plugin_deinit_all(); };
plugin = decoder_plugin_from_name(decoder_name); plugin = decoder_plugin_from_name(decoder_name);
if (plugin == NULL) { if (plugin == NULL) {
@ -107,9 +111,6 @@ try {
success = plugin->ScanStream(*is, print_handler, nullptr); success = plugin->ScanStream(*is, print_handler, nullptr);
} }
decoder_plugin_deinit_all();
input_stream_global_finish();
if (!success) { if (!success) {
fprintf(stderr, "Failed to read tags\n"); fprintf(stderr, "Failed to read tags\n");
return EXIT_FAILURE; return EXIT_FAILURE;