diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/clipboard.c | 2 | ||||
| -rwxr-xr-x | amiga/font.c | 6 | ||||
| -rwxr-xr-x | amiga/utf8.c | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 8df441e02..d39e89e4a 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -246,7 +246,7 @@ static void gui_set_clipboard(const char *buffer, size_t length, if(nsoption_bool(clipboard_write_utf8)) { WriteChunkBytes(iffh, buffer, length); } else { - if(utf8_to_local_encoding(buffer, length, &text) == UTF8_CONVERT_OK) { + if(utf8_to_local_encoding(buffer, length, &text) == NSERROR_OK) { char *p; p = text; diff --git a/amiga/font.c b/amiga/font.c index 36c810428..3430a4ea3 100755 --- a/amiga/font.c +++ b/amiga/font.c @@ -212,7 +212,7 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); int32 tempx; - if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return false; + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return false; outf16 = utf16; if(!(ofont = ami_open_outline_font(fstyle, 0))) return false; @@ -301,7 +301,7 @@ bool nsfont_split(const plot_font_style_t *fstyle, int32 tempx = 0; ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); - if(utf8_to_enc((char *)string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return false; + if(utf8_to_enc((char *)string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return false; outf16 = utf16; if(!(ofont = ami_open_outline_font(fstyle, 0))) return false; @@ -732,7 +732,7 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, if(!string || string[0]=='\0') return 0; if(!length) return 0; - if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return 0; + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; outf16 = utf16; if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; diff --git a/amiga/utf8.c b/amiga/utf8.c index a620ac181..d182492e9 100755 --- a/amiga/utf8.c +++ b/amiga/utf8.c @@ -34,7 +34,7 @@ char *ami_utf8_easy(const char *string) { char *localtext; - if(utf8_to_local_encoding(string,strlen(string),&localtext) == UTF8_CONVERT_OK) + if(utf8_to_local_encoding(string,strlen(string),&localtext) == NSERROR_OK) { return localtext; } @@ -48,7 +48,7 @@ char *ami_to_utf8_easy(const char *string) { char *localtext; - if(utf8_from_local_encoding(string,strlen(string),&localtext) == UTF8_CONVERT_OK) + if(utf8_from_local_encoding(string,strlen(string),&localtext) == NSERROR_OK) { return localtext; } @@ -58,8 +58,7 @@ char *ami_to_utf8_easy(const char *string) } } -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) { const char *encname = "ISO-8859-1"; @@ -73,8 +72,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, return utf8_from_enc(string,encname,len,result,NULL); } -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) { const char *encname = "ISO-8859-1"; |