#ifdef ASSUME_UTF8
return (char *)locale;
#else
- return locale ? FromCharset ("", locale) : NULL;
+ return locale ? FromCharset ("", locale, strlen(locale)) : NULL;
#endif
}
#ifdef ASSUME_UTF8
return strdup (locale);
#else
- return FromCharset ("", locale);
+ return FromCharset ("", locale, strlen(locale));
#endif
}
#ifdef ASSUME_UTF8
return (char *)utf8;
#else
- return utf8 ? ToCharset ("", utf8) : NULL;
+ size_t outsize;
+ return utf8 ? ToCharset ("", utf8, &outsize) : NULL;
#endif
}
#ifdef ASSUME_UTF8
return strdup (utf8);
#else
- return ToCharset ("", utf8);
+ size_t outsize;
+ return ToCharset ("", utf8, &outsize);
#endif
}