1 files changed, 15 insertions, 20 deletions

diff --git a/src/binary-writer.h b/src/binary-writer.h
index 830f0d9b..0b131b7f 100644
--- a/src/binary-writer.h
+++ b/src/binary-writer.h
@@ -22,37 +22,32 @@
 
 namespace wabt {
 
+class Writer;
 struct Module;
 struct Script;
-struct Writer;
-struct Stream;
 
 #define WABT_WRITE_BINARY_OPTIONS_DEFAULT \
   { nullptr, true, false, false }
 
 struct WriteBinaryOptions {
-  struct Stream* log_stream;
+  Stream* log_stream;
   bool canonicalize_lebs;
   bool relocatable;
   bool write_debug_names;
 };
 
-Result write_binary_module(struct Writer*,
-                           const struct Module*,
-                           const WriteBinaryOptions*);
+Result write_binary_module(Writer*, const Module*, const WriteBinaryOptions*);
 
 /* returns the length of the leb128 */
 uint32_t u32_leb128_length(uint32_t value);
 
-void write_u32_leb128(struct Stream* stream, uint32_t value, const char* desc);
+void write_u32_leb128(Stream* stream, uint32_t value, const char* desc);
 
-void write_i32_leb128(struct Stream* stream, int32_t value, const char* desc);
+void write_i32_leb128(Stream* stream, int32_t value, const char* desc);
 
-void write_fixed_u32_leb128(struct Stream* stream,
-                            uint32_t value,
-                            const char* desc);
+void write_fixed_u32_leb128(Stream* stream, uint32_t value, const char* desc);
 
-uint32_t write_fixed_u32_leb128_at(struct Stream* stream,
+uint32_t write_fixed_u32_leb128_at(Stream* stream,
                                    uint32_t offset,
                                    uint32_t value,
                                    const char* desc);
@@ -61,26 +56,26 @@ uint32_t write_fixed_u32_leb128_raw(uint8_t* data,
                                     uint8_t* end,
                                     uint32_t value);
 
-void write_type(struct Stream* stream, Type type);
+void write_type(Stream* stream, Type type);
 
-void write_str(struct Stream* stream,
+void write_str(Stream* stream,
                const char* s,
                size_t length,
-               PrintChars print_chars,
-               const char* desc);
+               const char* desc,
+               PrintChars print_chars = PrintChars::No);
 
-void write_opcode(struct Stream* stream, Opcode opcode);
+void write_opcode(Stream* stream, Opcode opcode);
 
-void write_limits(struct Stream* stream, const Limits* limits);
+void write_limits(Stream* stream, const Limits* limits);
 
 /* Convenience functions for writing enums as LEB128s. */
 template <typename T>
-void write_u32_leb128_enum(struct Stream* stream, T value, const char* desc) {
+void write_u32_leb128_enum(Stream* stream, T value, const char* desc) {
   write_u32_leb128(stream, static_cast<uint32_t>(value), desc);
 }
 
 template <typename T>
-void write_i32_leb128_enum(struct Stream* stream, T value, const char* desc) {
+void write_i32_leb128_enum(Stream* stream, T value, const char* desc) {
   write_i32_leb128(stream, static_cast<int32_t>(value), desc);
 }