From bdb02a9d8bcfa2a61f225ede3ae6a8b5b89f3c81 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 7 Jan 2016 17:11:56 +0100 Subject: [PATCH] gmio_stl: use gmio_ascii_stricmp() in gmio_stla_infos_get() --- src/gmio_stl/internal/stla_infos_get.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gmio_stl/internal/stla_infos_get.c b/src/gmio_stl/internal/stla_infos_get.c index e90ca3d..2f254e4 100644 --- a/src/gmio_stl/internal/stla_infos_get.c +++ b/src/gmio_stl/internal/stla_infos_get.c @@ -18,16 +18,11 @@ #include "../../gmio_core/error.h" #include "../../gmio_core/internal/min_max.h" #include "../../gmio_core/internal/string.h" +#include "../../gmio_core/internal/string_utils.h" #include "stl_rw_common.h" #include -GMIO_INLINE const char* find_substr( - const struct gmio_string* str, size_t str_offset, const char* substr) -{ - return strstr(str->ptr + str_offset, substr); -} - static uint32_t stla_facet_count( const struct gmio_string* strbuff, const char* end_ptr) { @@ -36,7 +31,7 @@ static uint32_t stla_facet_count( uint32_t facet_count = 0; do { - substr_at = find_substr(strbuff, strbuff_pos, "endfacet"); + substr_at = gmio_ascii_istrstr(strbuff->ptr + strbuff_pos, "endfacet"); if (substr_at != NULL && substr_at < end_ptr) { ++facet_count; /* Note: strlen("endfacet") == 8 */ @@ -111,7 +106,7 @@ int gmio_stla_infos_get( /* Find "endsolid" in memblock */ if (!endsolid_found) { - substr_at = find_substr(&strbuff, 0, "endsolid"); + substr_at = gmio_ascii_istrstr(strbuff.ptr, "endsolid"); endsolid_found = substr_at != NULL; }