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

fs/io/Reader: use C++ exceptions instead of class Error

Browse Source
This commit is contained in:
Max Kellermann
2015-12-16 11:05:33 +01:00
parent fe60c52c70
commit e6e7d6dbd6
33 changed files with 192 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/run_gunzip.cxx
View File

@@ -28,32 +28,32 @@
#include <stdlib.h>
#include <unistd.h>
static bool
Copy(OutputStream &dest, Reader &src, Error &error)
static void
Copy(OutputStream &dest, Reader &src)
{
while (true) {
char buffer[4096];
size_t nbytes = src.Read(buffer, sizeof(buffer), error);
size_t nbytes = src.Read(buffer, sizeof(buffer));
if (nbytes == 0)
return !error.IsDefined();
break;
dest.Write(buffer, nbytes);
}
}
static bool
CopyGunzip(OutputStream &dest, Reader &_src, Error &error)
static void
CopyGunzip(OutputStream &dest, Reader &_src)
{
GunzipReader src(_src, error);
return src.IsDefined() && Copy(dest, src, error);
GunzipReader src(_src);
Copy(dest, src);
}
static bool
CopyGunzip(FILE *_dest, Path src_path, Error &error)
static void
CopyGunzip(FILE *_dest, Path src_path)
{
StdioOutputStream dest(_dest);
FileReader src(src_path, error);
return src.IsDefined() && CopyGunzip(dest, src, error);
FileReader src(src_path);
CopyGunzip(dest, src);
}
int
@@ -67,12 +67,7 @@ main(int argc, gcc_unused char **argv)
Path path = Path::FromFS(argv[1]);
try {
Error error;
if (!CopyGunzip(stdout, path, error)) {
fprintf(stderr, "%s\n", error.GetMessage());
return EXIT_FAILURE;
}
CopyGunzip(stdout, path);
return EXIT_SUCCESS;
} catch (const std::exception &e) {
LogError(e);