From 121181bf158d73432eb4e10ff865217f9fb38c0c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 31 Mar 2014 15:39:21 +0200 Subject: [PATCH] Fix minor code style issues --- src/gmio_core/internal/ascii_parse.h | 14 +++++++++----- src/gmio_core/internal/convert.h | 5 +++-- src/gmio_stl/internal/stl_rw_common.h | 7 ++++--- src/gmio_stl/stlb_read.c | 6 +++--- src/gmio_stl/stlb_write.c | 6 +++--- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/gmio_core/internal/ascii_parse.h b/src/gmio_core/internal/ascii_parse.h index e8b29be..730bcf3 100644 --- a/src/gmio_core/internal/ascii_parse.h +++ b/src/gmio_core/internal/ascii_parse.h @@ -4,22 +4,26 @@ #include "../global.h" #include "../stream.h" -typedef struct +struct gmio_ascii_string_buffer { char* ptr; /*!< Buffer contents */ size_t len; /*!< Size(length) of current contents */ size_t max_len; /*!< Maximum contents size(length) */ -} gmio_ascii_string_buffer_t; +}; -typedef struct +typedef struct gmio_ascii_string_buffer gmio_ascii_string_buffer_t; + +struct gmio_ascii_stream_fwd_iterator { gmio_stream_t* stream; gmio_ascii_string_buffer_t buffer; size_t buffer_pos; /*!< Position indicator in buffer */ void* cookie; - void (*stream_read_hook)(void*, const gmio_ascii_string_buffer_t*); -} gmio_ascii_stream_fwd_iterator_t; + void (*stream_read_hook)(void* cookie, const gmio_ascii_string_buffer_t* str_buffer); +}; + +typedef struct gmio_ascii_stream_fwd_iterator gmio_ascii_stream_fwd_iterator_t; void gmio_ascii_stream_fwd_iterator_init(gmio_ascii_stream_fwd_iterator_t* it); char* gmio_current_char(const gmio_ascii_stream_fwd_iterator_t* it); diff --git a/src/gmio_core/internal/convert.h b/src/gmio_core/internal/convert.h index 4236acf..107e1f9 100644 --- a/src/gmio_core/internal/convert.h +++ b/src/gmio_core/internal/convert.h @@ -3,11 +3,12 @@ #include "../global.h" -typedef union +union gmio_uint32_float { uint32_t as_uint32; float as_float; -} gmio_uint32_float_t; +}; +typedef union gmio_uint32_float gmio_uint32_float_t; gmio_real32_t gmio_convert_real32(uint32_t val); uint32_t gmio_convert_uint32(gmio_real32_t val); diff --git a/src/gmio_stl/internal/stl_rw_common.h b/src/gmio_stl/internal/stl_rw_common.h index c421dbf..05c12c2 100644 --- a/src/gmio_stl/internal/stl_rw_common.h +++ b/src/gmio_stl/internal/stl_rw_common.h @@ -7,12 +7,13 @@ #include "../stl_geom.h" #include "../stl_triangle.h" -typedef struct +struct gmio_stlb_readwrite_helper { uint32_t facet_count; uint32_t i_facet_offset; - void (*fix_endian_func)(gmio_stl_triangle_t*); -} gmio_stlb_readwrite_helper; + void (*fix_endian_func)(gmio_stl_triangle_t* tri); +}; +typedef struct gmio_stlb_readwrite_helper gmio_stlb_readwrite_helper_t; gmio_bool_t gmio_check_transfer(int* error, const gmio_transfer_t* trsf); diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index c72ccd3..7662524 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -20,7 +20,7 @@ GMIO_INLINE static void read_triangle_memcpy(const uint8_t* buffer, static void gmio_stlb_read_facets(gmio_stl_geom_creator_t* creator, const uint8_t* buffer, - const gmio_stlb_readwrite_helper* rparams) + const gmio_stlb_readwrite_helper_t* rparams) { const uint32_t facet_count = rparams->facet_count; const uint32_t i_facet_offset = rparams->i_facet_offset; @@ -49,7 +49,7 @@ int gmio_stlb_read(gmio_stl_geom_creator_t *creator, gmio_endianness_t byte_order) { const gmio_endianness_t host_byte_order = gmio_host_endianness(); - gmio_stlb_readwrite_helper rparams; + gmio_stlb_readwrite_helper_t rparams; 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,7 @@ int gmio_stlb_read(gmio_stl_geom_creator_t *creator, return error; /* Initialize rparams */ - memset(&rparams, 0, sizeof(gmio_stlb_readwrite_helper)); + 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 f205dd8..b978066 100644 --- a/src/gmio_stl/stlb_write.c +++ b/src/gmio_stl/stlb_write.c @@ -18,7 +18,7 @@ GMIO_INLINE static void write_triangle_memcpy(const gmio_stl_triangle_t* triangl static void gmio_stlb_write_facets(const gmio_stl_geom_t* geom, uint8_t* buffer, - const gmio_stlb_readwrite_helper* wparams) + const gmio_stlb_readwrite_helper_t* wparams) { const uint32_t facet_count = wparams->facet_count; const uint32_t i_facet_offset = wparams->i_facet_offset; @@ -47,7 +47,7 @@ int gmio_stlb_write(const gmio_stl_geom_t *geom, const uint8_t *header_data, gmio_endianness_t byte_order) { - gmio_stlb_readwrite_helper wparams; + gmio_stlb_readwrite_helper_t wparams; const uint32_t facet_count = geom != NULL ? geom->triangle_count : 0; uint32_t i_facet = 0; int error = GMIO_NO_ERROR; @@ -59,7 +59,7 @@ int gmio_stlb_write(const gmio_stl_geom_t *geom, return error; /* Initialize wparams */ - memset(&wparams, 0, sizeof(gmio_stlb_readwrite_helper)); + 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;