archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove unused BLI_string_to_utf8

Browse Source
This commit is contained in:
Campbell Barton
2015-10-17 16:00:59 +11:00
parent bfdb42047a
commit 0b23799b6f
3 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_path_util.h
View File

@@ -158,10 +158,6 @@ bool BLI_path_suffix(char *string, size_t maxlen, const char *suffix, const char
# define BLI_path_ncmp strncmp # define BLI_path_ncmp strncmp
#endif #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 */ /* these values need to be hardcoded in structs, dna does not recognize defines */
/* also defined in DNA_space_types.h */ /* also defined in DNA_space_types.h */
#ifndef FILE_MAXDIR #ifndef FILE_MAXDIR

35
source/blender/blenlib/intern/path_util.c
View File

@@ -1981,38 +1981,3 @@ void BLI_path_native_slash(char *path)
BLI_str_replace_char(path + BLI_path_unc_prefix_len(path), '\\', '/'); BLI_str_replace_char(path + BLI_path_unc_prefix_len(path), '\\', '/');
#endif #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

11
source/blender/imbuf/intern/thumbs.c
View File

@@ -243,16 +243,9 @@ static int uri_from_filename(const char *path, char *uri)
#else #else
BLI_snprintf(orig_uri, URI_MAX, "file://%s", dirstart); BLI_snprintf(orig_uri, URI_MAX, "file://%s", dirstart);
#endif #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); escape_uri_string(orig_uri, uri, URI_MAX, UNSAFE_PATH);
#endif
return 1; return 1;
} }