caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_core: function gmio_stringstream_default_func_read() cannot be "inline"

Browse Source
This commit is contained in:
Hugues Delorme 2016-07-25 12:26:46 +02:00
parent 1bc3a98c5c
commit ec5ea263d4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gmio_core/internal/stringstream.c
View File

@ -53,6 +53,13 @@ void gmio_stringstream_init_pos(struct gmio_stringstream *sstream)
gmio_stringstream_next_char(sstream); gmio_stringstream_next_char(sstream);
} }
size_t gmio_stringstream_default_func_read(
void* cookie, struct gmio_stream* stream, char* ptr, size_t len)
{
GMIO_UNUSED(cookie);
return gmio_stream_read(stream, ptr, 1, len);
}
enum gmio_eat_word_error gmio_stringstream_eat_word( enum gmio_eat_word_error gmio_stringstream_eat_word(
struct gmio_stringstream *sstream, struct gmio_stringstream *sstream,
struct gmio_string *str) struct gmio_string *str)

10
src/gmio_core/internal/stringstream.h
View File

@ -73,7 +73,7 @@ struct gmio_stringstream gmio_stringstream(
void gmio_stringstream_init_pos(struct gmio_stringstream* sstream); void gmio_stringstream_init_pos(struct gmio_stringstream* sstream);
/*! Default function for gmio_stringstream::func_stream_read */ /*! Default function for gmio_stringstream::func_stream_read */
GMIO_INLINE size_t gmio_stringstream_default_func_read( size_t gmio_stringstream_default_func_read(
void* cookie, struct gmio_stream* stream, char* ptr, size_t len); void* cookie, struct gmio_stream* stream, char* ptr, size_t len);
/*! Returns the char where the iterator is currently pointing at */ /*! Returns the char where the iterator is currently pointing at */
@ -144,7 +144,6 @@ GMIO_INLINE float gmio_to_float32(const char* str);
*/ */
#include "c99_stdlib_compat.h" #include "c99_stdlib_compat.h"
#include "helper_stream.h"
#include "string_ascii_utils.h" #include "string_ascii_utils.h"
#if GMIO_STR2FLOAT_LIB == GMIO_STR2FLOAT_LIB_IRRLICHT #if GMIO_STR2FLOAT_LIB == GMIO_STR2FLOAT_LIB_IRRLICHT
# include "fast_atof.h" # include "fast_atof.h"
@ -163,13 +162,6 @@ const char* gmio_stringstream_current_char(
NULL; NULL;
} }
size_t gmio_stringstream_default_func_read(
void* cookie, struct gmio_stream* stream, char* ptr, size_t len)
{
GMIO_UNUSED(cookie);
return gmio_stream_read(stream, ptr, 1, len);
}
const char *gmio_stringstream_next_char(struct gmio_stringstream *sstream) const char *gmio_stringstream_next_char(struct gmio_stringstream *sstream)
{ {
++(sstream->strbuff_at); ++(sstream->strbuff_at);