diff options
Diffstat (limited to 'source/blender/blenfont/intern/blf_lang.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_lang.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 8a929e1ebf7..ebfb7f4eb65 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -38,11 +38,11 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" +#include "MEM_guardedalloc.h" - -#include "BLI_blenlib.h" #include "BLI_linklist.h" /* linknode */ #include "BLI_string.h" +#include "BLI_path_util.h" #ifdef __APPLE__ @@ -79,20 +79,14 @@ void BLF_lang_set(const char *str) #else char *locreturn= setlocale(LC_ALL, str); if (locreturn == NULL) { - char *lang; - - lang= (char*)malloc(sizeof(char)*(strlen(str)+7)); - - lang[0]= '\0'; - strcat(lang, str); - strcat(lang, ".UTF-8"); + char *lang= BLI_sprintfN("%s.UTF-8", str); locreturn= setlocale(LC_ALL, lang); if (locreturn == NULL) { printf("could not change language to %s nor %s\n", str, lang); } - free(lang); + MEM_freeN(lang); } setlocale(LC_NUMERIC, "C"); @@ -100,12 +94,12 @@ void BLF_lang_set(const char *str) textdomain(DOMAIN_NAME); bindtextdomain(DOMAIN_NAME, global_messagepath); /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */ - strcpy(global_language, str); + BLI_strncpy(global_language, str, sizeof(global_language)); } void BLF_lang_encoding(const char *str) { - strcpy(global_encoding_name, str); + BLI_strncpy(global_encoding_name, str, sizeof(global_encoding_name)); /* bind_textdomain_codeset(DOMAIN_NAME, encoding_name); */ } @@ -116,7 +110,7 @@ void BLF_lang_init(void) return; } -void BLF_lang_encoding(char *str) +void BLF_lang_encoding(const char *str) { (void)str; return; |