diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
| commit | 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc (patch) | |
| tree | efbc3d97a8650b682b7181e748698de9c555d80d /framebuffer | |
| parent | 4b760c7e499e2f5cb1d06242d5f186e14e94496a (diff) | |
| download | netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.gz netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.bz2 | |
move utf8 conversion routines to use nserror instead of their own error enum
Diffstat (limited to 'framebuffer')
| -rw-r--r-- | framebuffer/font_freetype.c | 8 | ||||
| -rw-r--r-- | framebuffer/font_internal.c | 10 | ||||
| -rw-r--r-- | framebuffer/font_internal.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index 521a5bc5f..eb7278c81 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -75,27 +75,27 @@ enum fb_face_e { static fb_faceid_t *fb_faces[FB_FACE_COUNT]; -utf8_convert_ret utf8_to_local_encoding(const char *string, +nserror utf8_to_local_encoding(const char *string, size_t len, char **result) { return utf8_to_enc(string, "UTF-8", len, result); } -utf8_convert_ret utf8_from_local_encoding(const char *string, +nserror utf8_from_local_encoding(const char *string, size_t len, char **result) { *result = malloc(len + 1); if (*result == NULL) { - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } memcpy(*result, string, len); (*result)[len] = '\0'; - return UTF8_CONVERT_OK; + return NSERROR_OK; } /* map cache manager handle to face id */ diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index dc1b35820..d13ba0032 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -59,7 +59,7 @@ fb_get_font(const plot_font_style_t *fstyle) } } -utf8_convert_ret utf8_to_font_encoding(const struct fb_font_desc* font, +nserror_ret utf8_to_font_encoding(const struct fb_font_desc* font, const char *string, size_t len, char **result) @@ -68,7 +68,7 @@ utf8_convert_ret utf8_to_font_encoding(const struct fb_font_desc* font, } -utf8_convert_ret utf8_to_local_encoding(const char *string, +nserror utf8_to_local_encoding(const char *string, size_t len, char **result) { @@ -76,20 +76,20 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, } -utf8_convert_ret utf8_from_local_encoding(const char *string, +nserror utf8_from_local_encoding(const char *string, size_t len, char **result) { *result = malloc(len + 1); if (*result == NULL) { - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; } memcpy(*result, string, len); (*result)[len] = '\0'; - return UTF8_CONVERT_OK; + return NSERROR_OK; } static bool nsfont_width(const plot_font_style_t *fstyle, diff --git a/framebuffer/font_internal.h b/framebuffer/font_internal.h index 5b0f30ba1..6b6de2f34 100644 --- a/framebuffer/font_internal.h +++ b/framebuffer/font_internal.h @@ -33,7 +33,7 @@ extern const struct fb_font_desc font_italic_bold; extern const struct fb_font_desc* fb_get_font(const plot_font_style_t *fstyle); -extern utf8_convert_ret utf8_to_font_encoding(const struct fb_font_desc* font, +extern nserror utf8_to_font_encoding(const struct fb_font_desc* font, const char *string, size_t len, char **result); |