Cleanup: remove unused BLI_string_to_utf8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 17 Oct 2015 05:00:59 +0000 (16:00 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 17 Oct 2015 05:00:59 +0000 (16:00 +1100)
source/blender/blenlib/BLI_path_util.h
source/blender/blenlib/intern/path_util.c
source/blender/imbuf/intern/thumbs.c

index 1be086cd96cc20809648b66316f5f1e1e79273c1..53b3c1db043f50dd0037b23d53d4d895510d1e18 100644 (file)
@@ -158,10 +158,6 @@ bool BLI_path_suffix(char *string, size_t maxlen, const char *suffix, const char
 #  define BLI_path_ncmp strncmp
 #endif
 
-#ifdef WITH_ICONV
-void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
-#endif
-
 /* these values need to be hardcoded in structs, dna does not recognize defines */
 /* also defined in DNA_space_types.h */
 #ifndef FILE_MAXDIR
index a32e2c089325b08ce0feaae15b9a902fe6aa536c..7a5033a8af57af4245f9e6355f7b967a8653b375 100644 (file)
@@ -1981,38 +1981,3 @@ void BLI_path_native_slash(char *path)
        BLI_str_replace_char(path + BLI_path_unc_prefix_len(path), '\\', '/');
 #endif
 }
-
-
-#ifdef WITH_ICONV
-
-/**
- * Converts a string encoded in the charset named by *code to UTF-8.
- * Opens a new iconv context each time it is run, which is probably not the
- * most efficient. */
-void BLI_string_to_utf8(char *original, char *utf_8, const char *code)
-{
-       size_t inbytesleft = strlen(original);
-       size_t outbytesleft = 512;
-       size_t rv = 0;
-       iconv_t cd;
-       
-       if (NULL == code) {
-               code = locale_charset();
-       }
-       cd = iconv_open("UTF-8", code);
-
-       if (cd == (iconv_t)(-1)) {
-               printf("iconv_open Error");
-               *utf_8 = '\0';
-               return;
-       }
-       rv = iconv(cd, &original, &inbytesleft, &utf_8, &outbytesleft);
-       if (rv == (size_t) -1) {
-               printf("iconv Error\n");
-               iconv_close(cd);
-               return;
-       }
-       *utf_8 = '\0';
-       iconv_close(cd);
-}
-#endif // WITH_ICONV
index e7bec7e643c7635f09cc2e82537408e0c275f89c..4e1b5c66c84ccbc4a0bb769ddadc9e945ace1335 100644 (file)
@@ -243,16 +243,9 @@ static int uri_from_filename(const char *path, char *uri)
 #else
        BLI_snprintf(orig_uri, URI_MAX, "file://%s", dirstart);
 #endif
-       
-#ifdef WITH_ICONV
-       {
-               char uri_utf8[URI_MAX];
-               escape_uri_string(orig_uri, uri_utf8, URI_MAX, UNSAFE_PATH);
-               BLI_string_to_utf8(uri_utf8, uri, NULL);
-       }
-#else 
+
        escape_uri_string(orig_uri, uri, URI_MAX, UNSAFE_PATH);
-#endif
+
        return 1;
 }