diff --git a/src/gmio_core/internal/error_check.c b/src/gmio_core/internal/error_check.c index d3db92e..5969ec5 100644 --- a/src/gmio_core/internal/error_check.c +++ b/src/gmio_core/internal/error_check.c @@ -29,6 +29,7 @@ #include "error_check.h" +#include "locale_utils.h" #include "../error.h" #include "../memblock.h" @@ -48,3 +49,10 @@ bool gmio_check_memblock_size( *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; return gmio_no_error(*error); } + +bool gmio_check_lc_numeric(int *error) +{ + if (!gmio_lc_numeric_is_C()) + *error = GMIO_ERROR_BAD_LC_NUMERIC; + return gmio_no_error(*error); +} diff --git a/src/gmio_core/internal/error_check.h b/src/gmio_core/internal/error_check.h index 4d7ef52..adf0025 100644 --- a/src/gmio_core/internal/error_check.h +++ b/src/gmio_core/internal/error_check.h @@ -39,4 +39,8 @@ bool gmio_check_memblock( bool gmio_check_memblock_size( int* error, const struct gmio_memblock* mblock, size_t minsize); +/*! Checks gmio_lc_numeric_is_C(), if false sets \p *error to + * \c GMIO_ERROR_BAD_LC_NUMERIC*/ +bool gmio_check_lc_numeric(int* error); + #endif /* GMIO_INTERNAL_ERROR_CHECK_H */ diff --git a/src/gmio_core/internal/locale_utils.c b/src/gmio_core/internal/locale_utils.c index b77ed76..40bc8d1 100644 --- a/src/gmio_core/internal/locale_utils.c +++ b/src/gmio_core/internal/locale_utils.c @@ -49,13 +49,6 @@ bool gmio_lc_numeric_is_C() || gmio_ascii_stricmp(lc, "POSIX") == 0); } -bool gmio_check_lc_numeric(int *error) -{ - if (!gmio_lc_numeric_is_C()) - *error = GMIO_ERROR_BAD_LC_NUMERIC; - return gmio_no_error(*error); -} - static char global_lc_numeric[64] = {0}; void gmio_lc_numeric_save() diff --git a/src/gmio_core/internal/locale_utils.h b/src/gmio_core/internal/locale_utils.h index fd27838..f797f5d 100644 --- a/src/gmio_core/internal/locale_utils.h +++ b/src/gmio_core/internal/locale_utils.h @@ -34,9 +34,5 @@ const char* gmio_lc_numeric(); /*! Returns result of case-insensitive test LC_NUMERIC == "C|POSIX" */ bool gmio_lc_numeric_is_C(); -/*! Checks gmio_lc_numeric_is_C(), if false sets \p *error to - * \c GMIO_ERROR_BAD_LC_NUMERIC*/ -bool gmio_check_lc_numeric(int* error); - void gmio_lc_numeric_save(); void gmio_lc_numeric_restore(); diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index 59ec59e..bd5add7 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -40,7 +40,6 @@ #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/helper_stream.h" #include "../../gmio_core/internal/helper_task_iface.h" -#include "../../gmio_core/internal/locale_utils.h" #include "../../gmio_core/internal/min_max.h" #include "../../gmio_core/internal/safe_cast.h" diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index bb8cfff..38448ad 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -37,10 +37,10 @@ #include "../gmio_core/error.h" #include "../gmio_core/internal/c99_stdio_compat.h" +#include "../gmio_core/internal/error_check.h" #include "../gmio_core/internal/helper_memblock.h" #include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_task_iface.h" -#include "../gmio_core/internal/locale_utils.h" #include "../gmio_core/internal/min_max.h" #include "../gmio_core/internal/safe_cast.h" #include "../gmio_core/internal/stringstream.h"