From 4fa3e7f38065a602c2060d9afab9e8b7ca6a3cb5 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 19 Nov 2014 09:41:10 +0100 Subject: [PATCH] Use = {0} init instead of memset() where applicable --- src/gmio_stl/stlb_read.c | 3 +-- src/gmio_stl/stlb_write.c | 3 +-- tests/test_internal.c | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index c01a9e4..2ff1df5 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -49,7 +49,7 @@ int gmio_stlb_read(gmio_stl_mesh_creator_t *creator, gmio_endianness_t byte_order) { const gmio_endianness_t host_byte_order = gmio_host_endianness(); - gmio_stlb_readwrite_helper_t rparams; + gmio_stlb_readwrite_helper_t rparams = {0}; uint8_t header_data[GMIO_STLB_HEADER_SIZE]; uint32_t total_facet_count = 0; /* Count of facets as declared in the stream */ int error = GMIO_NO_ERROR; /* Helper variable to store function result error code */ @@ -59,7 +59,6 @@ int gmio_stlb_read(gmio_stl_mesh_creator_t *creator, return error; /* Initialize rparams */ - memset(&rparams, 0, sizeof(gmio_stlb_readwrite_helper_t)); if (host_byte_order != byte_order) rparams.fix_endian_func = gmio_stl_triangle_bswap; diff --git a/src/gmio_stl/stlb_write.c b/src/gmio_stl/stlb_write.c index dcd333c..fbfb1a4 100644 --- a/src/gmio_stl/stlb_write.c +++ b/src/gmio_stl/stlb_write.c @@ -47,7 +47,7 @@ int gmio_stlb_write(const gmio_stl_mesh_t *mesh, const uint8_t *header_data, gmio_endianness_t byte_order) { - gmio_stlb_readwrite_helper_t wparams; + gmio_stlb_readwrite_helper_t wparams = {0}; const uint32_t facet_count = mesh != NULL ? mesh->triangle_count : 0; uint32_t i_facet = 0; int error = GMIO_NO_ERROR; @@ -59,7 +59,6 @@ int gmio_stlb_write(const gmio_stl_mesh_t *mesh, return error; /* Initialize wparams */ - memset(&wparams, 0, sizeof(gmio_stlb_readwrite_helper_t)); if (gmio_host_endianness() != byte_order) wparams.fix_endian_func = gmio_stl_triangle_bswap; wparams.facet_count = trsf->buffer_size / GMIO_STLB_TRIANGLE_RAWSIZE; diff --git a/tests/test_internal.c b/tests/test_internal.c index d9da243..1e8d81c 100644 --- a/tests/test_internal.c +++ b/tests/test_internal.c @@ -47,12 +47,12 @@ const char* test_internal__ascii_parse() "pi : 3.1415926535897932384626433832795"; { - gmio_buffer_t buff; - gmio_stream_t stream; + gmio_buffer_t buff = {0}; + gmio_stream_t stream = {0}; char small_fwd_it_str[4]; char fwd_it_str[32]; - gmio_ascii_stream_fwd_iterator_t fwd_it; + gmio_ascii_stream_fwd_iterator_t fwd_it = {0}; char copy_str[128]; gmio_ascii_string_buffer_t copy_strbuff; @@ -62,7 +62,6 @@ const char* test_internal__ascii_parse() buff.pos = 0; gmio_stream_set_buffer(&stream, &buff); - memset(&fwd_it, 0, sizeof(gmio_ascii_stream_fwd_iterator_t)); fwd_it.stream = &stream; fwd_it.buffer.ptr = fwd_it_str; fwd_it.buffer.max_len = sizeof(fwd_it_str);