Define and expose user-defined error handler #156
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ctabin
requested changes
Jul 26, 2022
src/libzippp.h
Outdated
| @@ -538,6 +547,8 @@ namespace libzippp { | |||
|
|
|||
| void** bufferData; | |||
| libzippp_uint64 bufferLength; | |||
|
|
|||
| ErrorHandlerCallback errorHandlingCallback = nullptr; | |||
There was a problem hiding this comment.
Initialize the variable in the constructor initializer.
| @@ -526,6 +531,10 @@ namespace libzippp { | |||
| inline double getProgressPrecision(void) const { return progressPrecision; } | |||
| void setProgressPrecision(double p) { progressPrecision = p; } | |||
|
|
|||
| void setErrorHandlerCallback(const ErrorHandlerCallback& callback) { | |||
There was a problem hiding this comment.
Done, see README.md
| @@ -99,14 +99,19 @@ struct zip_source; | |||
| namespace libzippp { | |||
| class ZipEntry; | |||
| class ZipProgressListener; | |||
|
|
|||
| /** | |||
| /** | ||
| * Represents a ZIP archive. This class provides useful methods to handle an archive | ||
| * content. It is simply a wrapper around libzip. | ||
| */ | ||
| class LIBZIPPP_API ZipArchive { | ||
| public: | ||
|
|
src/libzippp.cpp
Outdated
| @@ -310,7 +330,11 @@ int ZipArchive::close(void) { | |||
| zip_int64_t newLength = bufferLength + increment; | |||
| sourceBuffer = realloc(sourceBuffer, newLength * sizeof(char)); | |||
| if(sourceBuffer==nullptr) { | |||
| if (errorHandlingCallback) { | |||
| callErrorHandlingCb(zipHandle, errorHandlingCallback); | |||
Co-authored-by: Cédric Tabin <tabin.cedric@gmail.com>
flomnes
force-pushed
the
feature/user-defined-error-handler
branch
from
85351c4
to
6a6268f
Compare
|
@flomnes LGTM. Thanks for the amazing work ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.