summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-03-23 19:56:38 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-03-23 19:56:38 +0000
commite875c97c75e5949af05eb2b919936afb468d7063 (patch)
tree8ba3ddd9e558ba7b9346e8bd590c66ed98c5427f
parent4da6a038c15a5fa3d1c754b7278ae47627a44718 (diff)
downloadlibhubbub-e875c97c75e5949af05eb2b919936afb468d7063.tar.gz
libhubbub-e875c97c75e5949af05eb2b919936afb468d7063.tar.bz2
Drop usage of inline as it's invalid
svn path=/trunk/hubbub/; revision=4044
-rw-r--r--src/utils/utf16.c14
-rw-r--r--src/utils/utf16.h14
-rw-r--r--src/utils/utf8.c14
-rw-r--r--src/utils/utf8.h14
4 files changed, 28 insertions, 28 deletions
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 <hubbub/errors.h>
-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 <hubbub/errors.h>
-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