diff options
Diffstat (limited to 'riscos/ucstables.c')
-rw-r--r-- | riscos/ucstables.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/riscos/ucstables.c b/riscos/ucstables.c index 970caf122..4754bac89 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -446,17 +446,16 @@ static const struct special { * \param string The string to convert * \param len The length (in bytes) of the string, or 0 * \param result Pointer to location in which to store result - * \return The appropriate utf8_convert_ret value + * \return An nserror code */ -utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, - char **result) +nserror utf8_to_local_encoding(const char *string, size_t len, char **result) { os_error *error; int alphabet, i; size_t off, prev_off; char *temp, *cur_pos; const char *enc; - utf8_convert_ret err; + nserror err; assert(string); assert(result); @@ -473,7 +472,7 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, /* UTF-8 -> simply copy string */ if (alphabet == 111 /* UTF-8 */) { *result = strndup(string, len); - return UTF8_CONVERT_OK; + return NSERROR_OK; } /* get encoding name */ @@ -485,7 +484,7 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, /* create output buffer */ *(result) = malloc(len + 1); if (!(*result)) - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; *(*result) = '\0'; prev_off = 0; @@ -508,10 +507,10 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, if (off - prev_off > 0) { err = utf8_to_enc(string + prev_off, enc, off - prev_off, &temp); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); free(*result); - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } strcat(cur_pos, temp); @@ -533,10 +532,10 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, if (prev_off < len) { err = utf8_to_enc(string + prev_off, enc, len - prev_off, &temp); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); free(*result); - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } strcat(cur_pos, temp); @@ -544,7 +543,7 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, free(temp); } - return UTF8_CONVERT_OK; + return NSERROR_OK; } /** @@ -553,10 +552,9 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, * \param string The string to convert * \param len The length (in bytes) of the string, or 0 * \param result Pointer to location in which to store result - * \return The appropriate utf8_convert_ret value + * \return An nserror code */ -utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, - char **result) +nserror utf8_from_local_encoding(const char *string, size_t len, char **result) { os_error *error; int alphabet, i, num_specials = 0, result_alloc; @@ -564,7 +562,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, size_t off, prev_off, cur_off; char *temp; const char *enc; - utf8_convert_ret err; + nserror err; assert(string && result); @@ -581,10 +579,10 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, if (alphabet == 111 /* UTF-8 */) { temp = strndup(string, len); if (!temp) - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; *result = temp; - return UTF8_CONVERT_OK; + return NSERROR_OK; } /* get encoding name */ @@ -598,7 +596,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, *(result) = malloc(result_alloc); if (!(*result)) - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; *(*result) = '\0'; prev_off = 0; @@ -619,11 +617,11 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, if (off - prev_off > 0) { err = utf8_from_enc(string + prev_off, enc, off - prev_off, &temp, NULL); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_from_enc failed")); free(*result); - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } strcat((*result) + cur_off, temp); @@ -647,7 +645,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, (3 * SPECIAL_CHUNK_SIZE)); if (!temp) { free(*result); - return UTF8_CONVERT_NOMEM; + return NSERRO_NOMEM; } *result = temp; @@ -661,11 +659,11 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, if (prev_off < len) { err = utf8_from_enc(string + prev_off, enc, len - prev_off, &temp, NULL); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_from_enc failed")); free(*result); - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } strcat((*result) + cur_off, temp); @@ -680,9 +678,9 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, if (!temp) { LOG(("realloc failed")); free(*result); - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } *result = temp; - return UTF8_CONVERT_OK; + return NSERROR_OK; } |