Roll back the two previous "@I/O redirect" commits
See the previous commit for the rationale.
diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go
index c78a386..5f7c32e 100644
--- a/lang/builtin/builtin.go
+++ b/lang/builtin/builtin.go
@@ -34,6 +34,7 @@
var Statuses = [...]string{
// Notes.
+ `"@I/O redirect"`,
`"@end of data"`,
`"@metadata reported"`,
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index 13153a5..3065fab 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -189,6 +189,7 @@
} wuffs_base__status;
+extern const char* wuffs_base__note__i_o_redirect;
extern const char* wuffs_base__note__end_of_data;
extern const char* wuffs_base__note__metadata_reported;
extern const char* wuffs_base__suspension__even_more_information;
@@ -7966,6 +7967,7 @@
0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,
};
+const char* wuffs_base__note__i_o_redirect = "@base: I/O redirect";
const char* wuffs_base__note__end_of_data = "@base: end of data";
const char* wuffs_base__note__metadata_reported = "@base: metadata reported";
const char* wuffs_base__suspension__even_more_information =
@@ -12249,7 +12251,7 @@
status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
goto exit;
} else if (self->private_impl.f_io_redirect_fourcc != 0) {
- status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
+ status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
goto ok;
}
{
@@ -12555,11 +12557,11 @@
if (v_bits_per_pixel == 0) {
if (v_compression == 4) {
self->private_impl.f_io_redirect_fourcc = 1246774599;
- status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
+ status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
goto ok;
} else if (v_compression == 5) {
self->private_impl.f_io_redirect_fourcc = 1347307296;
- status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
+ status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
goto ok;
}
status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs
index 1299685..28311da 100644
--- a/std/bmp/decode_bmp.wuffs
+++ b/std/bmp/decode_bmp.wuffs
@@ -72,7 +72,7 @@
if (this.call_sequence <> 0) or (this.io_redirect_fourcc == 1) {
return base."#bad call sequence"
} else if this.io_redirect_fourcc <> 0 {
- return base."@metadata reported" // XXX
+ return base."@I/O redirect"
}
// Read the BITMAPFILEHEADER (14 bytes).
@@ -130,10 +130,10 @@
if bits_per_pixel == 0 {
if compression == 4 {
this.io_redirect_fourcc = 'JPEG'be
- return base."@metadata reported" // XXX
+ return base."@I/O redirect"
} else if compression == 5 {
this.io_redirect_fourcc = 'PNG 'be
- return base."@metadata reported" // XXX
+ return base."@I/O redirect"
}
return "#unsupported BMP file"
} else if bits_per_pixel == 24 {
diff --git a/test/c/std/bmp.c b/test/c/std/bmp.c
index 5679347..1e20e2f 100644
--- a/test/c/std/bmp.c
+++ b/test/c/std/bmp.c
@@ -131,9 +131,9 @@
wuffs_base__status status =
wuffs_bmp__decoder__decode_image_config(&dec, NULL, &src);
- if (status.repr != wuffs_base__note__metadata_reported) { // XXX
+ if (status.repr != wuffs_base__note__i_o_redirect) {
RETURN_FAIL("decode_image_config: have \"%s\", want \"%s\"", status.repr,
- wuffs_base__note__metadata_reported); // XXX
+ wuffs_base__note__i_o_redirect);
}
wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer();
