From 2755a61ae95cb744926ea8f1d2284ddcbdeabe2f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 4 Dec 2017 10:29:17 +1100 Subject: [PATCH] Rename std/deflate's packageid --- gen/c/std/deflate.c | 36 ++++++++++++++++---------------- gen/c/std/zlib.c | 36 ++++++++++++++++---------------- gen/h/std/deflate.h | 36 ++++++++++++++++---------------- gen/h/std/zlib.h | 36 ++++++++++++++++---------------- std/deflate/decode_deflate.wuffs | 2 +- 5 files changed, 73 insertions(+), 73 deletions(-) diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 2b334b3e..8b820951 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -125,7 +125,7 @@ extern "C" { // wuffs_deflate__status__is_error instead. typedef int32_t wuffs_deflate__status; -#define wuffs_deflate__packageid 967230 // 0x000EC23E +#define wuffs_deflate__packageid 848533 // 0x000CF295 #define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 #define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -141,34 +141,34 @@ typedef int32_t wuffs_deflate__status; -2147483638 // 0x8000000A #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ - -1157040128 // 0xBB08F800 + -1278585856 // 0xB3CA5400 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \ - -1157040127 // 0xBB08F801 + -1278585855 // 0xB3CA5401 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \ - -1157040126 // 0xBB08F802 + -1278585854 // 0xB3CA5402 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \ - -1157040125 // 0xBB08F803 -#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xBB08F804 + -1278585853 // 0xB3CA5403 +#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \ - -1157040123 // 0xBB08F805 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1157040122 // 0xBB08F806 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xBB08F807 -#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xBB08F808 + -1278585851 // 0xB3CA5405 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407 +#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408 #define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ - -1157040119 // 0xBB08F809 + -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ - -1157040118 // 0xBB08F80A + -1278585846 // 0xB3CA540A #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1157040117 // 0xBB08F80B + -1278585845 // 0xB3CA540B #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1157040116 // 0xBB08F80C + -1278585844 // 0xB3CA540C #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1157040115 // 0xBB08F80D + -1278585843 // 0xB3CA540D #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1157040114 // 0xBB08F80E + -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1157040113 // 0xBB08F80F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1157040112 // 0xBB08F810 + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 2689d067..e1daad7b 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -134,7 +134,7 @@ extern "C" { // wuffs_deflate__status__is_error instead. typedef int32_t wuffs_deflate__status; -#define wuffs_deflate__packageid 967230 // 0x000EC23E +#define wuffs_deflate__packageid 848533 // 0x000CF295 #define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 #define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -150,34 +150,34 @@ typedef int32_t wuffs_deflate__status; -2147483638 // 0x8000000A #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ - -1157040128 // 0xBB08F800 + -1278585856 // 0xB3CA5400 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \ - -1157040127 // 0xBB08F801 + -1278585855 // 0xB3CA5401 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \ - -1157040126 // 0xBB08F802 + -1278585854 // 0xB3CA5402 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \ - -1157040125 // 0xBB08F803 -#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xBB08F804 + -1278585853 // 0xB3CA5403 +#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \ - -1157040123 // 0xBB08F805 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1157040122 // 0xBB08F806 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xBB08F807 -#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xBB08F808 + -1278585851 // 0xB3CA5405 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407 +#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408 #define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ - -1157040119 // 0xBB08F809 + -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ - -1157040118 // 0xBB08F80A + -1278585846 // 0xB3CA540A #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1157040117 // 0xBB08F80B + -1278585845 // 0xB3CA540B #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1157040116 // 0xBB08F80C + -1278585844 // 0xB3CA540C #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1157040115 // 0xBB08F80D + -1278585843 // 0xB3CA540D #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1157040114 // 0xBB08F80E + -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1157040113 // 0xBB08F80F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1157040112 // 0xBB08F810 + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 77337544..90cf401a 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -125,7 +125,7 @@ extern "C" { // wuffs_deflate__status__is_error instead. typedef int32_t wuffs_deflate__status; -#define wuffs_deflate__packageid 967230 // 0x000EC23E +#define wuffs_deflate__packageid 848533 // 0x000CF295 #define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 #define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -141,34 +141,34 @@ typedef int32_t wuffs_deflate__status; -2147483638 // 0x8000000A #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ - -1157040128 // 0xBB08F800 + -1278585856 // 0xB3CA5400 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \ - -1157040127 // 0xBB08F801 + -1278585855 // 0xB3CA5401 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \ - -1157040126 // 0xBB08F802 + -1278585854 // 0xB3CA5402 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \ - -1157040125 // 0xBB08F803 -#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xBB08F804 + -1278585853 // 0xB3CA5403 +#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \ - -1157040123 // 0xBB08F805 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1157040122 // 0xBB08F806 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xBB08F807 -#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xBB08F808 + -1278585851 // 0xB3CA5405 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407 +#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408 #define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ - -1157040119 // 0xBB08F809 + -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ - -1157040118 // 0xBB08F80A + -1278585846 // 0xB3CA540A #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1157040117 // 0xBB08F80B + -1278585845 // 0xB3CA540B #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1157040116 // 0xBB08F80C + -1278585844 // 0xB3CA540C #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1157040115 // 0xBB08F80D + -1278585843 // 0xB3CA540D #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1157040114 // 0xBB08F80E + -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1157040113 // 0xBB08F80F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1157040112 // 0xBB08F810 + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 7ec20cd0..6af5cf70 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -134,7 +134,7 @@ extern "C" { // wuffs_deflate__status__is_error instead. typedef int32_t wuffs_deflate__status; -#define wuffs_deflate__packageid 967230 // 0x000EC23E +#define wuffs_deflate__packageid 848533 // 0x000CF295 #define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 #define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -150,34 +150,34 @@ typedef int32_t wuffs_deflate__status; -2147483638 // 0x8000000A #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ - -1157040128 // 0xBB08F800 + -1278585856 // 0xB3CA5400 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \ - -1157040127 // 0xBB08F801 + -1278585855 // 0xB3CA5401 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \ - -1157040126 // 0xBB08F802 + -1278585854 // 0xB3CA5402 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \ - -1157040125 // 0xBB08F803 -#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xBB08F804 + -1278585853 // 0xB3CA5403 +#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE -1278585852 // 0xB3CA5404 #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \ - -1157040123 // 0xBB08F805 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1157040122 // 0xBB08F806 -#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xBB08F807 -#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xBB08F808 + -1278585851 // 0xB3CA5405 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE -1278585850 // 0xB3CA5406 +#define WUFFS_DEFLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1278585849 // 0xB3CA5407 +#define WUFFS_DEFLATE__ERROR_BAD_FLATE_BLOCK -1278585848 // 0xB3CA5408 #define WUFFS_DEFLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ - -1157040119 // 0xBB08F809 + -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ - -1157040118 // 0xBB08F80A + -1278585846 // 0xB3CA540A #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1157040117 // 0xBB08F80B + -1278585845 // 0xB3CA540B #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1157040116 // 0xBB08F80C + -1278585844 // 0xB3CA540C #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1157040115 // 0xBB08F80D + -1278585843 // 0xB3CA540D #define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1157040114 // 0xBB08F80E + -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1157040113 // 0xBB08F80F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1157040112 // 0xBB08F810 + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 9dbbdde2..3b16ab40 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -packageid "flte" +packageid "dflt" // TODO: rename "struct flate_decoder" to just "struct decoder", to avoid // stutter in the fully qualified C name such as "wuffs_flate__flate_decoder".