Skip to content
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.

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

Fix compilation with -Werror=unused-result #3676

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,3 @@ repos:
rev: v0.6.13
hooks:
- id: cmake-format
- repo: https://github.com/Quantco/pre-commit-mirrors-typos
rev: 1.27.3
hooks:
- id: typos-conda
exclude: (CHANGELOG.md)
# In case of ambiguity (multiple possible corrections), `typos` will just report it to the user and move on without applying/writing any changes.
# cf. https://github.com/crate-ci/typos
args: [ --write-changes ]
9 changes: 5 additions & 4 deletions micromamba/src/constructor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,18 +196,19 @@ void
read_binary_from_stdin_and_write_to_file(fs::u8path& filename)
{
std::ofstream out_stream = open_ofstream(filename, std::ofstream::binary);
FILE* stdin_bin;
// Need to reopen stdin as binary
std::freopen(nullptr, "rb", stdin);
if (std::ferror(stdin))
stdin_bin = std::freopen(nullptr, "rb", stdin);
if (std::ferror(stdin_bin))
{
throw std::runtime_error("Re-opening stdin as binary failed.");
}
std::size_t len;
std::array<char, 1024> buffer;

while ((len = std::fread(buffer.data(), sizeof(char), buffer.size(), stdin)) > 0)
while ((len = std::fread(buffer.data(), sizeof(char), buffer.size(), stdin_bin)) > 0)
{
if (std::ferror(stdin) && !std::feof(stdin))
if (std::ferror(stdin_bin) && !std::feof(stdin_bin))
{
throw std::runtime_error("Reading from stdin failed.");
}
Expand Down
Loading