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

fs/io/GzipOutputStream: use C++ exceptions in constructor

Browse Source
This commit is contained in:
Max Kellermann
2015-12-16 10:14:56 +01:00
parent 7eae3bc8c5
commit 36d6ead65c
7 changed files with 92 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/run_gzip.cxx
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "fs/io/GzipOutputStream.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "Log.hxx"
#include "util/Error.hxx"
#include <stdio.h>
@@ -48,9 +49,8 @@ Copy(OutputStream &dest, int src, Error &error)
static bool
CopyGzip(OutputStream &_dest, int src, Error &error)
{
GzipOutputStream dest(_dest, error);
return dest.IsDefined() &&
Copy(dest, src, error) &&
GzipOutputStream dest(_dest);
return Copy(dest, src, error) &&
dest.Flush(error);
}
@@ -69,11 +69,16 @@ main(int argc, gcc_unused char **argv)
return EXIT_FAILURE;
}
Error error;
if (!CopyGzip(stdout, STDIN_FILENO, error)) {
fprintf(stderr, "%s\n", error.GetMessage());
try {
Error error;
if (!CopyGzip(stdout, STDIN_FILENO, error)) {
fprintf(stderr, "%s\n", error.GetMessage());
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
} catch (const std::exception &e) {
LogError(e);
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}