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.

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

Jump to bottom

handle fwrite results #1098 #1099

Merged
merged 2 commits into from
Mar 30, 2019
Merged

handle fwrite results #1098 #1099

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
043a266
handle fwrite results #1098
BillyDonahue Mar 28, 2019
a26315a
clang-format
BillyDonahue Mar 29, 2019
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
14 changes: 11 additions & 3 deletions include/fmt/format-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,21 @@ void format_error_code(internal::buffer& out, int error_code,
assert(out.size() <= inline_buffer_size);
}

// try an fwrite, FMT_THROW on failure
void fwrite_fully(const void* ptr, size_t size, size_t count, FILE* stream) {
size_t written = std::fwrite(ptr, size, count, stream);
if (written < count) {
FMT_THROW(system_error(errno, "cannot write to file"));
}
}

void report_error(FormatFunc func, int error_code,
string_view message) FMT_NOEXCEPT {
memory_buffer full_message;
func(full_message, error_code, message);
// Use Writer::data instead of Writer::c_str to avoid potential memory
// allocation.
std::fwrite(full_message.data(), full_message.size(), 1, stderr);
fwrite_fully(full_message.data(), 1, full_message.size(), stderr);
BillyDonahue marked this conversation as resolved.
Show resolved Hide resolved
std::fputc('\n', stderr);
}
} // namespace
Expand Down Expand Up @@ -907,13 +915,13 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
memory_buffer buffer;
internal::vformat_to(buffer, format_str,
basic_format_args<buffer_context<char>::type>(args));
std::fwrite(buffer.data(), 1, buffer.size(), f);
fwrite_fully(buffer.data(), 1, buffer.size(), f);
}

FMT_FUNC void vprint(std::FILE* f, wstring_view format_str, wformat_args args) {
wmemory_buffer buffer;
internal::vformat_to(buffer, format_str, args);
std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f);
fwrite_fully(buffer.data(), sizeof(wchar_t), buffer.size(), f);
}

FMT_FUNC void vprint(string_view format_str, format_args args) {
Expand Down