Skip to content

gh-153621: Expose raw libzstd error code in ZstdError messages #153641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
su-213 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −11
Open

gh-153621: Expose raw libzstd error code in ZstdError messages #153641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions Modules/_zstd/_zstdmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,45 +67,52 @@ set_zstd_error(const _zstd_state *state, error_type type, size_t zstd_ret)
}
switch (type) {
case ERR_DECOMPRESS:
msg = "Unable to decompress Zstandard data: %s";
msg = "Unable to decompress Zstandard data: %s (error code %llu)";
break;
case ERR_COMPRESS:
msg = "Unable to compress Zstandard data: %s";
msg = "Unable to compress Zstandard data: %s (error code %llu)";
break;
case ERR_SET_PLEDGED_INPUT_SIZE:
msg = "Unable to set pledged uncompressed content size: %s";
msg = "Unable to set pledged uncompressed content size: %s "
"(error code %llu)";
break;

case ERR_LOAD_D_DICT:
msg = "Unable to load Zstandard dictionary or prefix for "
"decompression: %s";
"decompression: %s (error code %llu)";
break;
case ERR_LOAD_C_DICT:
msg = "Unable to load Zstandard dictionary or prefix for "
"compression: %s";
"compression: %s (error code %llu)";
break;

case ERR_GET_C_BOUNDS:
msg = "Unable to get zstd compression parameter bounds: %s";
msg = "Unable to get zstd compression parameter bounds: %s "
"(error code %llu)";
break;
case ERR_GET_D_BOUNDS:
msg = "Unable to get zstd decompression parameter bounds: %s";
msg = "Unable to get zstd decompression parameter bounds: %s "
"(error code %llu)";
break;
case ERR_SET_C_LEVEL:
msg = "Unable to set zstd compression level: %s";
msg = "Unable to set zstd compression level: %s "
"(error code %llu)";
break;

case ERR_TRAIN_DICT:
msg = "Unable to train the Zstandard dictionary: %s";
msg = "Unable to train the Zstandard dictionary: %s "
"(error code %llu)";
break;
case ERR_FINALIZE_DICT:
msg = "Unable to finalize the Zstandard dictionary: %s";
msg = "Unable to finalize the Zstandard dictionary: %s "
"(error code %llu)";
break;

default:
Py_UNREACHABLE();
}
PyErr_Format(state->ZstdError, msg, ZSTD_getErrorName(zstd_ret));
PyErr_Format(state->ZstdError, msg, ZSTD_getErrorName(zstd_ret),
(unsigned long long)zstd_ret);
}

typedef struct {
Expand Down
Loading