iso2ascii: convert_charset() benutzen
Statt div. regreplace() machen wir es jetzt
auch gleich richtig.
Change-Id: I8861bfca0ee26681143e80fcb47eddadc6656604
diff --git a/secure/simul_efun/simul_efun.c b/secure/simul_efun/simul_efun.c
index f69fb8a..5dfea94 100644
--- a/secure/simul_efun/simul_efun.c
+++ b/secure/simul_efun/simul_efun.c
@@ -1744,19 +1744,9 @@
public string iso2ascii( string str )
{
- if ( !stringp(str) || !sizeof(str) )
+ if ( !sizeof(str) )
return "";
-
- str = regreplace( str, "ä", "ae", 1 );
- str = regreplace( str, "ö", "oe", 1 );
- str = regreplace( str, "ü", "ue", 1 );
- str = regreplace( str, "Ä", "Ae", 1 );
- str = regreplace( str, "Ö", "Oe", 1 );
- str = regreplace( str, "Ü", "Ue", 1 );
- str = regreplace( str, "ß", "ss", 1 );
- str = regreplace( str, "[^ -~]", "?", 1 );
-
- return str;
+ return convert_charset(str, "ISO-8859-15", "ASCII//TRANSLIT");
}