diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-09-29 21:11:30 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-09-29 21:11:30 +0200 |
commit | 604162acdf5283a9759c1b3ce9e90887a6599ce7 (patch) | |
tree | 06dc5f9ce330afb03922f822b9203169e17576e6 /depends/pack200/src/utils.cpp | |
parent | d267d86f6e24c4f947c30c1a3642d57b82f8addd (diff) | |
download | MultiMC-604162acdf5283a9759c1b3ce9e90887a6599ce7.tar MultiMC-604162acdf5283a9759c1b3ce9e90887a6599ce7.tar.gz MultiMC-604162acdf5283a9759c1b3ce9e90887a6599ce7.tar.lz MultiMC-604162acdf5283a9759c1b3ce9e90887a6599ce7.tar.xz MultiMC-604162acdf5283a9759c1b3ce9e90887a6599ce7.zip |
Turn pack200 into an actual library
Diffstat (limited to 'depends/pack200/src/utils.cpp')
-rw-r--r-- | depends/pack200/src/utils.cpp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/depends/pack200/src/utils.cpp b/depends/pack200/src/utils.cpp index 3ea8c92e..0b7d91ca 100644 --- a/depends/pack200/src/utils.cpp +++ b/depends/pack200/src/utils.cpp @@ -29,6 +29,7 @@ #include <string.h> #include <limits.h> #include <assert.h> +#include <stdint.h> #include <sys/stat.h> @@ -57,35 +58,14 @@ void *must_malloc(size_t size) } else { - unpack_abort(ERROR_ENOMEM); + throw std::runtime_error(ERROR_ENOMEM); } return ptr; } -void unpack_abort(const char *msg, unpacker *u) +void unpack_abort(const char *msg) { if (msg == nullptr) msg = "corrupt pack file or internal error"; - if (u == nullptr) - u = unpacker::current(); - if (u == nullptr) - { - fprintf(stderr, "Error: unpacker: %s\n", msg); - ::abort(); - return; - } - u->abort(msg); -} - -bool unpack_aborting(unpacker *u) -{ - if (u == nullptr) - u = unpacker::current(); - if (u == nullptr) - { - fprintf(stderr, "Error: unpacker: no current instance\n"); - ::abort(); - return true; - } - return u->aborting(); + throw std::runtime_error(msg); } |