Don't use designated initializers

Some C/C++ compilers, such as MSVC, don't always support them. They're
also not supported by GCC's "g++ -std=c++11 -Wpedantic".
This commit is contained in:
Nigel Tao committed 2019-03-09 10:08:00 +11:00
1 parent ef7aa0d980
commit c4b8a6a4cc
19 files changed
+639 -516

No files matched your search

+2 -4
View File
@@ -76,10 +76,8 @@ int main(int argc, char** argv) {
continue;
}
uint32_t checksum = h.update((wuffs_base__slice_u8){
.ptr = src_buffer,
.len = static_cast<size_t>(n),
});
uint32_t checksum =
h.update(wuffs_base__make_slice_u8(src_buffer, static_cast<size_t>(n)));
if (n == 0) {
printf("%08" PRIx32 "\n", checksum);
+18 -23
View File
@@ -42,7 +42,7 @@ support true color: https://gist.github.com/XVilka/8346728
bool started = false;
struct timespec start_time;
uint64_t micros_since_start(struct timespec* now) {
int64_t micros_since_start(struct timespec* now) {
if (!started) {
return 0;
}
@@ -88,13 +88,13 @@ wuffs_base__color_u32_argb_premul* curr_dst_buffer = NULL;
wuffs_base__color_u32_argb_premul* prev_dst_buffer = NULL;
size_t dst_len; // Length in bytes.
wuffs_base__slice_u8 pixbuf = ((wuffs_base__slice_u8){});
wuffs_base__slice_u8 workbuf = ((wuffs_base__slice_u8){});
wuffs_base__slice_u8 printbuf = ((wuffs_base__slice_u8){});
wuffs_base__slice_u8 pixbuf = {0};
wuffs_base__slice_u8 workbuf = {0};
wuffs_base__slice_u8 printbuf = {0};
bool first_play = true;
uint32_t num_loops_remaining = 0;
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
wuffs_base__pixel_buffer pb = {0};
wuffs_base__flicks cumulative_delay_micros = 0;
@@ -273,11 +273,11 @@ const char* allocate(wuffs_gif__decoder* dec, wuffs_base__image_config* ic) {
const char* status = try_allocate(dec, ic);
if (status) {
free(printbuf.ptr);
printbuf = ((wuffs_base__slice_u8){});
printbuf = wuffs_base__make_slice_u8(NULL, 0);
free(workbuf.ptr);
workbuf = ((wuffs_base__slice_u8){});
workbuf = wuffs_base__make_slice_u8(NULL, 0);
free(pixbuf.ptr);
pixbuf = ((wuffs_base__slice_u8){});
pixbuf = wuffs_base__make_slice_u8(NULL, 0);
free(prev_dst_buffer);
prev_dst_buffer = NULL;
free(curr_dst_buffer);
@@ -295,22 +295,17 @@ const char* play() {
return status;
}
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = src_buffer,
.len = src_len,
}),
.meta = ((wuffs_base__io_buffer_meta){
.wi = src_len,
.ri = 0,
.pos = 0,
.closed = true,
}),
});
wuffs_base__io_buffer src;
src.data.ptr = src_buffer;
src.data.len = src_len;
src.meta.wi = src_len;
src.meta.ri = 0;
src.meta.pos = 0;
src.meta.closed = true;
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
if (first_play) {
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__image_config ic = {0};
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (status) {
return status;
@@ -342,7 +337,7 @@ const char* play() {
}
while (1) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__frame_config fc = {0};
wuffs_base__status status =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (status) {
@@ -391,7 +386,7 @@ const char* play() {
if (clock_gettime(CLOCK_MONOTONIC, &now)) {
return strerror(errno);
}
uint64_t elapsed_micros = micros_since_start(&now);
int64_t elapsed_micros = micros_since_start(&now);
if (cumulative_delay_micros > elapsed_micros) {
usleep(cumulative_delay_micros - elapsed_micros);
}
+26 -29
View File
@@ -43,10 +43,11 @@ for a C compiler $CC, such as clang or gcc.
#include "wuffs/release/c/wuffs-unsupported-snapshot.c"
#ifndef DST_BUFFER_SIZE
#define DST_BUFFER_SIZE (128 * 1024)
#define DST_BUFFER_SIZE 1024
#endif
uint8_t dst_buffer[DST_BUFFER_SIZE];
// hello_ptr and hello_len hold a gzip-encoded "Hello Wuffs."
// src_ptr and src_len hold a gzip-encoded "Hello Wuffs."
//
// $ echo "Hello Wuffs." | gzip --no-name | xxd
// 00000000: 1f8b 0800 0000 0000 0003 f348 cdc9 c957 ...........H...W
@@ -55,14 +56,14 @@ for a C compiler $CC, such as clang or gcc.
//
// Passing --no-name to the gzip command line also means to skip the timestamp,
// which means that its output is deterministic.
uint8_t hello_ptr[] = {
uint8_t src_ptr[] = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // 00..07
0x00, 0x03, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0x57, // 08..0F
0x08, 0x2f, 0x4d, 0x4b, 0x2b, 0xd6, 0xe3, 0x02, // 10..17
0x00, 0x3c, 0x84, 0x75, 0xbb, 0x0d, 0x00, 0x00, // 18..1F
0x00, // 20..20
};
size_t hello_len = 0x21;
size_t src_len = 0x21;
#define WORK_BUFFER_SIZE WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
#if WORK_BUFFER_SIZE > 0
@@ -76,29 +77,27 @@ uint8_t work_buffer[1];
static void ignore_return_value(int ignored) {}
static const char* decode() {
uint8_t dst_buffer[DST_BUFFER_SIZE];
wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = dst_buffer,
.len = DST_BUFFER_SIZE,
}),
});
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = hello_ptr,
.len = hello_len,
}),
.meta = ((wuffs_base__io_buffer_meta){
.wi = hello_len,
.ri = 0,
.pos = 0,
.closed = true,
}),
});
wuffs_base__io_buffer dst;
dst.data.ptr = dst_buffer;
dst.data.len = DST_BUFFER_SIZE;
dst.meta.wi = 0;
dst.meta.ri = 0;
dst.meta.pos = 0;
dst.meta.closed = false;
wuffs_base__io_buffer src;
src.data.ptr = src_ptr;
src.data.len = src_len;
src.meta.wi = src_len;
src.meta.ri = 0;
src.meta.pos = 0;
src.meta.closed = true;
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gzip__decoder* dec = calloc(sizeof__wuffs_gzip__decoder(), 1);
wuffs_gzip__decoder* dec =
(wuffs_gzip__decoder*)(calloc(sizeof__wuffs_gzip__decoder(), 1));
if (!dec) {
return "out of memory";
}
@@ -109,11 +108,9 @@ static const char* decode() {
free(dec);
return status;
}
status = wuffs_gzip__decoder__decode_io_writer(dec, dst_writer, src_reader,
((wuffs_base__slice_u8){
.ptr = work_buffer,
.len = WORK_BUFFER_SIZE,
}));
status = wuffs_gzip__decoder__decode_io_writer(
dec, dst_writer, src_reader,
wuffs_base__make_slice_u8(work_buffer, WORK_BUFFER_SIZE));
if (status) {
free(dec);
return status;
+16 -16
View File
@@ -91,18 +91,21 @@ static const char* decode() {
return status;
}
wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = dst_buffer,
.len = DST_BUFFER_SIZE,
}),
});
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = ((wuffs_base__slice_u8){
.ptr = src_buffer,
.len = SRC_BUFFER_SIZE,
}),
});
wuffs_base__io_buffer dst;
dst.data.ptr = dst_buffer;
dst.data.len = DST_BUFFER_SIZE;
dst.meta.wi = 0;
dst.meta.ri = 0;
dst.meta.pos = 0;
dst.meta.closed = false;
wuffs_base__io_buffer src;
src.data.ptr = src_buffer;
src.data.len = SRC_BUFFER_SIZE;
src.meta.wi = 0;
src.meta.ri = 0;
src.meta.pos = 0;
src.meta.closed = false;
while (true) {
const int stdin_fd = 0;
@@ -123,10 +126,7 @@ static const char* decode() {
status = wuffs_gzip__decoder__decode_io_writer(
&dec, wuffs_base__io_buffer__writer(&dst),
wuffs_base__io_buffer__reader(&src),
((wuffs_base__slice_u8){
.ptr = work_buffer,
.len = WORK_BUFFER_SIZE,
}));
wuffs_base__make_slice_u8(work_buffer, WORK_BUFFER_SIZE));
if (dst.meta.wi) {
// TODO: handle EINTR and other write errors; see "man 2 write".