From 9445c8b9d09df3db16bcbb5bd33e4e14e819f701 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 28 Oct 2022 17:06:55 +1100 Subject: [PATCH] Guard header declarations on the MODULE_ETC macros --- example/bzcat/bzcat.c | 2 +- internal/cgen/cgen.go | 26 ++++++----- release/c/wuffs-unsupported-snapshot.c | 60 ++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/example/bzcat/bzcat.c b/example/bzcat/bzcat.c index d1afe10c..56d2b801 100644 --- a/example/bzcat/bzcat.c +++ b/example/bzcat/bzcat.c @@ -78,7 +78,7 @@ for a C compiler $CC, such as clang or gcc. #endif #define WORK_BUFFER_ARRAY_SIZE \ - WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE + WUFFS_BZIP2__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE uint8_t g_dst_buffer_array[DST_BUFFER_ARRAY_SIZE]; uint8_t g_src_buffer_array[SRC_BUFFER_ARRAY_SIZE]; diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 7d3fd7ec..dbee2989 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -76,15 +76,16 @@ const ( // // At the start of a function, these pointers are initialized from an // io_buffer's fields (ptr, ri, wi, len). For an io_reader: -// - io0_etc = ptr -// - io1_etc = ptr + ri -// - iop_etc = ptr + ri -// - io2_etc = ptr + wi +// - io0_etc = ptr +// - io1_etc = ptr + ri +// - iop_etc = ptr + ri +// - io2_etc = ptr + wi +// // and for an io_writer: -// - io0_etc = ptr -// - io1_etc = ptr + wi -// - iop_etc = ptr + wi -// - io2_etc = ptr + len +// - io0_etc = ptr +// - io1_etc = ptr + wi +// - iop_etc = ptr + wi +// - io2_etc = ptr + len const ( io0Prefix = "io0_" // Base. io1Prefix = "io1_" // Lower bound. @@ -674,6 +675,7 @@ func (g *gen) genIncludes(b *buffer) error { b.writes("#if defined(WUFFS_IMPLEMENTATION) && !defined(WUFFS_CONFIG__MODULES)\n") b.writes("#define WUFFS_CONFIG__MODULES\n") b.printf("#define WUFFS_CONFIG__MODULE__%s\n", g.PKGNAME) + b.writes("#define WUFFS_NONMONOLITHIC\n") b.writes("#endif\n\n") usesList := []string(nil) @@ -709,7 +711,10 @@ func (g *gen) genIncludes(b *buffer) error { } func (g *gen) genHeader(b *buffer) error { - b.writes("\n") + module := "!defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__" + g.PKGNAME + + ") || defined(WUFFS_NONMONOLITHIC)" + b.printf("#if %s\n\n", module) + b.writes("// ---------------- Status Codes\n\n") wroteStatus := false @@ -813,6 +818,7 @@ func (g *gen) genHeader(b *buffer) error { } b.writes("#endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)\n\n") + b.printf("#endif // %s\n", module) return nil } @@ -872,7 +878,7 @@ func (g *gen) genImpl(b *buffer) error { return err } - b.printf("#endif // %s\n\n", module) + b.printf("#endif // %s\n", module) return nil } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0517639d..27c69b59 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6344,6 +6344,8 @@ struct wuffs_base__token_decoder__struct { } // extern "C" #endif +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes // ---------------- Public Consts @@ -6526,6 +6528,10 @@ struct wuffs_adler32__hasher__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_bmp__error__bad_header[]; @@ -6874,6 +6880,10 @@ struct wuffs_bmp__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_bzip2__error__bad_huffman_code_over_subscribed[]; @@ -7138,6 +7148,10 @@ struct wuffs_bzip2__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_cbor__error__bad_input[]; @@ -7363,6 +7377,10 @@ struct wuffs_cbor__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes // ---------------- Public Consts @@ -7544,6 +7562,10 @@ struct wuffs_crc32__ieee_hasher__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_deflate__error__bad_huffman_code_over_subscribed[]; @@ -7814,6 +7836,10 @@ struct wuffs_deflate__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_lzw__error__bad_code[]; @@ -8049,6 +8075,10 @@ struct wuffs_lzw__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_gif__error__bad_extension_label[]; @@ -8471,6 +8501,10 @@ struct wuffs_gif__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_gzip__error__bad_checksum[]; @@ -8683,6 +8717,10 @@ struct wuffs_gzip__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_json__error__bad_c0_control_code[]; @@ -8951,6 +8989,10 @@ struct wuffs_json__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_nie__error__bad_header[]; @@ -9269,6 +9311,10 @@ struct wuffs_nie__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_zlib__note__dictionary_required[]; @@ -9510,6 +9556,10 @@ struct wuffs_zlib__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_png__error__bad_animation_sequence_number[]; @@ -9980,6 +10030,10 @@ struct wuffs_png__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_tga__error__bad_header[]; @@ -10325,6 +10379,10 @@ struct wuffs_tga__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC) + +#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP) || defined(WUFFS_NONMONOLITHIC) + // ---------------- Status Codes extern const char wuffs_wbmp__error__bad_header[]; @@ -10648,6 +10706,8 @@ struct wuffs_wbmp__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) +#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP) || defined(WUFFS_NONMONOLITHIC) + #if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // ---------------- Auxiliary - Base