فهرست منبع

SDL_iconv_string() defaults to UTF-8

Fixes https://github.com/libsdl-org/SDL/issues/8287
Sam Lantinga 1 سال پیش
والد
کامیت
1375d2049d
1فایلهای تغییر یافته به همراه6 افزوده شده و 10 حذف شده
  1. 6 10
      src/stdlib/SDL_iconv.c

+ 6 - 10
src/stdlib/SDL_iconv.c

@@ -786,17 +786,13 @@ char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inb
     size_t outbytesleft;
     size_t retCode = 0;
 
-    cd = SDL_iconv_open(tocode, fromcode);
-    if (cd == (SDL_iconv_t)-1) {
-        /* See if we can recover here (fixes iconv on Solaris 11) */
-        if (tocode == NULL || !*tocode) {
-            tocode = "UTF-8";
-        }
-        if (fromcode == NULL || !*fromcode) {
-            fromcode = "UTF-8";
-        }
-        cd = SDL_iconv_open(tocode, fromcode);
+    if (tocode == NULL || !*tocode) {
+        tocode = "UTF-8";
+    }
+    if (fromcode == NULL || !*fromcode) {
+        fromcode = "UTF-8";
     }
+    cd = SDL_iconv_open(tocode, fromcode);
     if (cd == (SDL_iconv_t)-1) {
         return NULL;
     }