psyc-mirrors
/
libpsyc
mirror of git://git.psyc.eu/libpsyc
1
0
Fork 0
Code Issues Releases Wiki Activity

hopefully fixed the static inline mess now

This commit is contained in:
lurchi 2016-09-05 12:50:37 +02:00
parent 516231b0ba
commit d65ac87b9e
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/psyc/parse.h
View File

@ -688,7 +688,7 @@ psyc_parse_remaining_buffer (PsycParseState *state)
* in case of the body it will point to the data. * in case of the body it will point to the data.
*/ */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
inline extern inline
#endif #endif
PsycParseRC PsycParseRC
psyc_parse (PsycParseState *state, char *oper, psyc_parse (PsycParseState *state, char *oper,
@ -706,25 +706,25 @@ psyc_parse (PsycParseState *state, char *oper,
* @param elem It will point to the next element in the list. * @param elem It will point to the next element in the list.
*/ */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
inline extern inline
#endif #endif
PsycParseListRC PsycParseListRC
psyc_parse_list (PsycParseListState *state, PsycString *type, PsycString *elem); psyc_parse_list (PsycParseListState *state, PsycString *type, PsycString *elem);
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
inline extern inline
#endif #endif
PsycParseDictRC PsycParseDictRC
psyc_parse_dict (PsycParseDictState *state, PsycString *type, PsycString *elem); psyc_parse_dict (PsycParseDictState *state, PsycString *type, PsycString *elem);
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
inline extern inline
#endif #endif
PsycParseIndexRC PsycParseIndexRC
psyc_parse_index (PsycParseIndexState *state, PsycString *idx); psyc_parse_index (PsycParseIndexState *state, PsycString *idx);
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
inline extern inline
#endif #endif
PsycParseUpdateRC PsycParseUpdateRC
psyc_parse_update (PsycParseUpdateState *state, char *oper, PsycString *value); psyc_parse_update (PsycParseUpdateState *state, char *oper, PsycString *value);

20
src/parse.c
View File

@ -119,7 +119,7 @@ psyc_parse_remaining_buffer (PsycParseState *state);
* *
* @return PARSE_ERROR or PARSE_SUCCESS * @return PARSE_ERROR or PARSE_SUCCESS
*/ */
static inline ParseRC inline ParseRC
parse_keyword (ParseState *state, PsycString *name) parse_keyword (ParseState *state, PsycString *name)
{ {
name->data = state->buffer.data + state->cursor; name->data = state->buffer.data + state->cursor;
@ -138,7 +138,7 @@ parse_keyword (ParseState *state, PsycString *name)
* *
* @return PARSE_SUCCESS, PARSE_ERROR or PARSE_INSUFFICIENT * @return PARSE_SUCCESS, PARSE_ERROR or PARSE_INSUFFICIENT
*/ */
static inline ParseRC inline ParseRC
parse_length (ParseState *state, size_t *len) parse_length (ParseState *state, size_t *len)
{ {
ParseRC ret = PARSE_ERROR; ParseRC ret = PARSE_ERROR;
@ -165,7 +165,7 @@ parse_length (ParseState *state, size_t *len)
* *
* @return PARSE_SUCCESS or PARSE_INCOMPLETE * @return PARSE_SUCCESS or PARSE_INCOMPLETE
*/ */
static inline ParseRC inline ParseRC
parse_binary (ParseState *state, size_t length, PsycString *value, size_t *parsed) parse_binary (ParseState *state, size_t length, PsycString *value, size_t *parsed)
{ {
size_t remaining = length - *parsed; size_t remaining = length - *parsed;
@ -197,7 +197,7 @@ parse_binary (ParseState *state, size_t length, PsycString *value, size_t *parse
* *
* @return PARSE_SUCCESS or PARSE_INSUFFICIENT * @return PARSE_SUCCESS or PARSE_INSUFFICIENT
*/ */
static inline ParseRC inline ParseRC
parse_until (ParseState *state, const char end, PsycString *value) parse_until (ParseState *state, const char end, PsycString *value)
{ {
value->data = state->buffer.data + state->cursor; value->data = state->buffer.data + state->cursor;
@ -215,7 +215,7 @@ parse_until (ParseState *state, const char end, PsycString *value)
* @return PARSE_ERROR or PARSE_SUCCESS * @return PARSE_ERROR or PARSE_SUCCESS
*/ */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
extern inline inline
#endif #endif
ParseRC ParseRC
psyc_parse_modifier (PsycParseState *state, char *oper, psyc_parse_modifier (PsycParseState *state, char *oper,
@ -282,7 +282,7 @@ psyc_parse_modifier (PsycParseState *state, char *oper,
/** Parse PSYC packets. */ /** Parse PSYC packets. */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
static inline inline
#endif #endif
PsycParseRC PsycParseRC
psyc_parse (PsycParseState *state, char *oper, psyc_parse (PsycParseState *state, char *oper,
@ -566,7 +566,7 @@ psyc_parse (PsycParseState *state, char *oper,
* list-value = %x00-7B / %x7D-FF ; any byte except "|" * list-value = %x00-7B / %x7D-FF ; any byte except "|"
*/ */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
extern inline inline
#endif #endif
PsycParseListRC PsycParseListRC
psyc_parse_list (PsycParseListState *state, PsycString *type, PsycString *elem) psyc_parse_list (PsycParseListState *state, PsycString *type, PsycString *elem)
@ -730,7 +730,7 @@ psyc_parse_list (PsycParseListState *state, PsycString *type, PsycString *elem)
* dict-value = %x00-7A / %x7C-FF ; any byte except "}" * dict-value = %x00-7A / %x7C-FF ; any byte except "}"
*/ */
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
extern inline inline
#endif #endif
PsycParseDictRC PsycParseDictRC
psyc_parse_dict (PsycParseDictState *state, PsycString *type, PsycString *elem) psyc_parse_dict (PsycParseDictState *state, PsycString *type, PsycString *elem)
@ -956,7 +956,7 @@ psyc_parse_dict (PsycParseDictState *state, PsycString *type, PsycString *elem)
} }
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
extern inline inline
#endif #endif
PsycParseIndexRC PsycParseIndexRC
psyc_parse_index (PsycParseIndexState *state, PsycString *idx) psyc_parse_index (PsycParseIndexState *state, PsycString *idx)
@ -1084,7 +1084,7 @@ psyc_parse_index (PsycParseIndexState *state, PsycString *idx)
} }
#ifdef __INLINE_PSYC_PARSE #ifdef __INLINE_PSYC_PARSE
extern inline inline
#endif #endif
PsycParseUpdateRC PsycParseUpdateRC
psyc_parse_update (PsycParseUpdateState *state, char *oper, PsycString *value) psyc_parse_update (PsycParseUpdateState *state, char *oper, PsycString *value)