From a4751fe78f119305fa8927f1bba10aefecc14f3f Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Sun, 16 Apr 2017 16:07:03 -0700 Subject: Refactor Stream/Writer; write as C++ (#399) --- src/binary-reader-objdump.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/binary-reader-objdump.cc') diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc index b086c55b..a57ec1bb 100644 --- a/src/binary-reader-objdump.cc +++ b/src/binary-reader-objdump.cc @@ -485,14 +485,14 @@ class BinaryReaderObjdump : public BinaryReaderObjdumpBase { void PrintDetails(const char* fmt, ...); Result OnCount(uint32_t count); - Stream* out_stream; + std::unique_ptr out_stream; }; BinaryReaderObjdump::BinaryReaderObjdump(const uint8_t* data, size_t size, ObjdumpOptions* options) : BinaryReaderObjdumpBase(data, size, options), - out_stream(init_stdout_stream()) {} + out_stream(FileStream::CreateStdout()) {} Result BinaryReaderObjdump::BeginCustomSection(uint32_t size, StringSlice section_name) { @@ -533,8 +533,8 @@ Result BinaryReaderObjdump::BeginSection(BinarySection section_code, case ObjdumpMode::RawData: if (section_match) { printf("\nContents of section %s:\n", name); - write_memory_dump(out_stream, data + state->offset, size, state->offset, - PrintChars::Yes, nullptr, nullptr); + out_stream->WriteMemoryDump(data + state->offset, size, state->offset, + nullptr, nullptr, PrintChars::Yes); } break; case ObjdumpMode::Prepass: @@ -807,8 +807,8 @@ Result BinaryReaderObjdump::OnDataSegmentData(uint32_t index, const void* src_data, uint32_t size) { if (ShouldPrintDetails()) { - write_memory_dump(out_stream, src_data, size, 0, PrintChars::Yes, " - ", - nullptr); + out_stream->WriteMemoryDump(src_data, size, 0, " - ", nullptr, + PrintChars::Yes); } return Result::Ok; } -- cgit v1.2.3