From e875c97c75e5949af05eb2b919936afb468d7063 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 23 Mar 2008 19:56:38 +0000 Subject: Drop usage of inline as it's invalid svn path=/trunk/hubbub/; revision=4044 --- src/utils/utf16.c | 14 +++++++------- src/utils/utf16.h | 14 +++++++------- src/utils/utf8.c | 14 +++++++------- src/utils/utf8.h | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/utils') diff --git a/src/utils/utf16.c b/src/utils/utf16.c index 715be5c..a295109 100644 --- a/src/utils/utf16.c +++ b/src/utils/utf16.c @@ -24,7 +24,7 @@ * \param clen Pointer to location to receive byte length of UTF-16 sequence * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_to_ucs4(const uint8_t *s, size_t len, +hubbub_error hubbub_utf16_to_ucs4(const uint8_t *s, size_t len, uint32_t *ucs4, size_t *clen) { const uint16_t *ss = (const uint16_t *) (const void *) s; @@ -62,7 +62,7 @@ inline hubbub_error hubbub_utf16_to_ucs4(const uint8_t *s, size_t len, * \param len Pointer to location to receive length of multibyte sequence * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_from_ucs4(uint32_t ucs4, uint8_t *s, +hubbub_error hubbub_utf16_from_ucs4(uint32_t ucs4, uint8_t *s, size_t *len) { uint16_t *ss = (uint16_t *) (void *) s; @@ -94,7 +94,7 @@ inline hubbub_error hubbub_utf16_from_ucs4(uint32_t ucs4, uint8_t *s, * \param len Pointer to location to receive length of string * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_length(const uint8_t *s, size_t max, +hubbub_error hubbub_utf16_length(const uint8_t *s, size_t max, size_t *len) { const uint16_t *ss = (const uint16_t *) (const void *) s; @@ -125,7 +125,7 @@ inline hubbub_error hubbub_utf16_length(const uint8_t *s, size_t max, * \param len Pointer to location to receive length * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_char_byte_length(const uint8_t *s, +hubbub_error hubbub_utf16_char_byte_length(const uint8_t *s, size_t *len) { const uint16_t *ss = (const uint16_t *) (const void *) s; @@ -150,7 +150,7 @@ inline hubbub_error hubbub_utf16_char_byte_length(const uint8_t *s, * previous legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_prev(const uint8_t *s, uint32_t off, +hubbub_error hubbub_utf16_prev(const uint8_t *s, uint32_t off, uint32_t *prevoff) { const uint16_t *ss = (const uint16_t *) (const void *) s; @@ -178,7 +178,7 @@ inline hubbub_error hubbub_utf16_prev(const uint8_t *s, uint32_t off, * next legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_next(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf16_next(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff) { const uint16_t *ss = (const uint16_t *) (const void *) s; @@ -206,7 +206,7 @@ inline hubbub_error hubbub_utf16_next(const uint8_t *s, uint32_t len, * next legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf16_next_paranoid(const uint8_t *s, +hubbub_error hubbub_utf16_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff) { const uint16_t *ss = (const uint16_t *) (const void *) s; diff --git a/src/utils/utf16.h b/src/utils/utf16.h index 4605e03..2cea38d 100644 --- a/src/utils/utf16.h +++ b/src/utils/utf16.h @@ -16,22 +16,22 @@ #include -inline hubbub_error hubbub_utf16_to_ucs4(const uint8_t *s, size_t len, +hubbub_error hubbub_utf16_to_ucs4(const uint8_t *s, size_t len, uint32_t *ucs4, size_t *clen); -inline hubbub_error hubbub_utf16_from_ucs4(uint32_t ucs4, uint8_t *s, +hubbub_error hubbub_utf16_from_ucs4(uint32_t ucs4, uint8_t *s, size_t *len); -inline hubbub_error hubbub_utf16_length(const uint8_t *s, size_t max, +hubbub_error hubbub_utf16_length(const uint8_t *s, size_t max, size_t *len); -inline hubbub_error hubbub_utf16_char_byte_length(const uint8_t *s, +hubbub_error hubbub_utf16_char_byte_length(const uint8_t *s, size_t *len); -inline hubbub_error hubbub_utf16_prev(const uint8_t *s, uint32_t off, +hubbub_error hubbub_utf16_prev(const uint8_t *s, uint32_t off, uint32_t *prevoff); -inline hubbub_error hubbub_utf16_next(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf16_next(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); -inline hubbub_error hubbub_utf16_next_paranoid(const uint8_t *s, +hubbub_error hubbub_utf16_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); #endif diff --git a/src/utils/utf8.c b/src/utils/utf8.c index 062d629..08a1853 100644 --- a/src/utils/utf8.c +++ b/src/utils/utf8.c @@ -47,7 +47,7 @@ static const uint8_t numContinuations[256] = { * \param clen Pointer to location to receive byte length of UTF-8 sequence * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_to_ucs4(const uint8_t *s, size_t len, +hubbub_error hubbub_utf8_to_ucs4(const uint8_t *s, size_t len, uint32_t *ucs4, size_t *clen) { if (s == NULL || ucs4 == NULL || clen == NULL) @@ -146,7 +146,7 @@ inline hubbub_error hubbub_utf8_to_ucs4(const uint8_t *s, size_t len, * \param len Pointer to location to receive length of multibyte sequence * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_from_ucs4(uint32_t ucs4, uint8_t *s, +hubbub_error hubbub_utf8_from_ucs4(uint32_t ucs4, uint8_t *s, size_t *len) { uint32_t l = 0; @@ -203,7 +203,7 @@ inline hubbub_error hubbub_utf8_from_ucs4(uint32_t ucs4, uint8_t *s, * \param len Pointer to location to receive length of string * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_length(const uint8_t *s, size_t max, +hubbub_error hubbub_utf8_length(const uint8_t *s, size_t max, size_t *len) { const uint8_t *end = s + max; @@ -242,7 +242,7 @@ inline hubbub_error hubbub_utf8_length(const uint8_t *s, size_t max, * \param len Pointer to location to receive length * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_char_byte_length(const uint8_t *s, +hubbub_error hubbub_utf8_char_byte_length(const uint8_t *s, size_t *len) { if (s == NULL || len == NULL) @@ -262,7 +262,7 @@ inline hubbub_error hubbub_utf8_char_byte_length(const uint8_t *s, * previous legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_prev(const uint8_t *s, uint32_t off, +hubbub_error hubbub_utf8_prev(const uint8_t *s, uint32_t off, uint32_t *prevoff) { if (s == NULL || prevoff == NULL) @@ -286,7 +286,7 @@ inline hubbub_error hubbub_utf8_prev(const uint8_t *s, uint32_t off, * next legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_next(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf8_next(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff) { if (s == NULL || off >= len || nextoff == NULL) @@ -314,7 +314,7 @@ inline hubbub_error hubbub_utf8_next(const uint8_t *s, uint32_t len, * next legal character * \return HUBBUB_OK on success, appropriate error otherwise */ -inline hubbub_error hubbub_utf8_next_paranoid(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf8_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff) { bool valid; diff --git a/src/utils/utf8.h b/src/utils/utf8.h index 5b865c1..f2eedcb 100644 --- a/src/utils/utf8.h +++ b/src/utils/utf8.h @@ -16,22 +16,22 @@ #include -inline hubbub_error hubbub_utf8_to_ucs4(const uint8_t *s, size_t len, +hubbub_error hubbub_utf8_to_ucs4(const uint8_t *s, size_t len, uint32_t *ucs4, size_t *clen); -inline hubbub_error hubbub_utf8_from_ucs4(uint32_t ucs4, uint8_t *s, +hubbub_error hubbub_utf8_from_ucs4(uint32_t ucs4, uint8_t *s, size_t *len); -inline hubbub_error hubbub_utf8_length(const uint8_t *s, size_t max, +hubbub_error hubbub_utf8_length(const uint8_t *s, size_t max, size_t *len); -inline hubbub_error hubbub_utf8_char_byte_length(const uint8_t *s, +hubbub_error hubbub_utf8_char_byte_length(const uint8_t *s, size_t *len); -inline hubbub_error hubbub_utf8_prev(const uint8_t *s, uint32_t off, +hubbub_error hubbub_utf8_prev(const uint8_t *s, uint32_t off, uint32_t *prevoff); -inline hubbub_error hubbub_utf8_next(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf8_next(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); -inline hubbub_error hubbub_utf8_next_paranoid(const uint8_t *s, uint32_t len, +hubbub_error hubbub_utf8_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); #endif -- cgit v1.2.3