From 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 28 Jan 2014 21:40:13 +0000 Subject: move utf8 conversion routines to use nserror instead of their own error enum --- cocoa/utf8.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cocoa') diff --git a/cocoa/utf8.m b/cocoa/utf8.m index 2ec829888..7b69918d0 100644 --- a/cocoa/utf8.m +++ b/cocoa/utf8.m @@ -20,21 +20,20 @@ #import "utils/utf8.h" -utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, +nserror utf8_to_local_encoding(const char *string, size_t len, char **result) { NSCParameterAssert( NULL != result ); char *newString = malloc( len + 1 ); - if (NULL == newString) return UTF8_CONVERT_NOMEM; + if (NULL == newString) return NSERROR_NOMEM; memcpy( newString, string, len ); newString[len] = 0; *result = newString; - return UTF8_CONVERT_OK; + return NSERROR_OK; } -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) { /* same function, local encoding = UTF-8 */ return utf8_to_local_encoding( string, len, result ); -- cgit v1.2.3