X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=utf8lib.c;fp=utf8lib.c;h=c1e5a81000c635537687d7ed1edf858b6edc6d5b;hb=2f6f5958dbf32ea6a77347544e28ea2cc8239bcd;hp=3e1d62fa797b9898dcba309cef2ad73543417b43;hpb=91b007dca3f500011681ff488b0de437913f23ad;p=xonotic%2Fdarkplaces.git

diff --git a/utf8lib.c b/utf8lib.c
index 3e1d62fa..c1e5a810 100644
--- a/utf8lib.c
+++ b/utf8lib.c
@@ -486,10 +486,10 @@ Uchar u8_getnchar(const char *_s, const char **_end, size_t _maxlen)
 int u8_fromchar(Uchar w, char *to, size_t maxlen)
 {
 	if (maxlen < 1)
-		return -2;
+		return 0;
 
 	if (!w)
-		return -5;
+		return 0;
 
 	if (w >= 0xE000 && !utf8_enable.integer)
 		w -= 0xE000;
@@ -544,7 +544,7 @@ int u8_fromchar(Uchar w, char *to, size_t maxlen)
 		to[0] = 0xE0 | w;
 		return 4;
 	}
-	return -1;
+	return 0;
 }
 
 /** uses u8_fromchar on a static buffer
@@ -602,10 +602,13 @@ size_t u8_wcstombs(char *mb, const Uchar *wcs, size_t maxlen)
 		return 0;
 	for (i = 0; wcs[i] && i < maxlen-1; ++i)
 	{
+		/*
 		int len;
 		if ( (len = u8_fromchar(wcs[i], mb, maxlen - i)) < 0)
 			return (mb - start);
 		mb += len;
+		*/
+		mb += u8_fromchar(wcs[i], mb, maxlen - i);
 	}
 	*mb = 0;
 	return (mb - start);