mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify 7z code

Browse Source
This commit is contained in:
twinaphex 2015-12-02 02:42:06 +01:00
parent adffda5cfe
commit a106d7143b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
file_ops.c
View File

@ -47,20 +47,20 @@
#include "deps/7zip/7zCrc.h" #include "deps/7zip/7zCrc.h"
#include "deps/7zip/7zFile.h" #include "deps/7zip/7zFile.h"
static bool Utf16_To_Char(uint8_t **utf_data, size_t *dest_len, const uint16_t *s) static bool Utf16_To_Char(uint8_t **utf_data, size_t *dest_len, const uint16_t *in)
{ {
unsigned len = 0; unsigned len = 0;
while (s[len] != '\0') while (in[len] != '\0')
len++; len++;
utf16_conv_utf8(NULL, dest_len, s, len); utf16_conv_utf8(NULL, dest_len, in, len);
*dest_len += 1; *dest_len += 1;
*utf_data = (uint8_t*)malloc(*dest_len); *utf_data = (uint8_t*)malloc(*dest_len);
if (*utf_data == 0) if (*utf_data == 0)
return false; return false;
return utf16_conv_utf8(*utf_data, dest_len, s, len); return utf16_conv_utf8(*utf_data, dest_len, in, len);
} }
static bool ConvertUtf16toCharString(const uint16_t *in, char *s, size_t len) static bool ConvertUtf16toCharString(const uint16_t *in, char *s, size_t len)
@ -69,10 +69,11 @@ static bool ConvertUtf16toCharString(const uint16_t *in, char *s, size_t len)
uint8_t *utf16_data = NULL; uint8_t *utf16_data = NULL;
bool ret = Utf16_To_Char(&utf16_data, &dest_len, in); bool ret = Utf16_To_Char(&utf16_data, &dest_len, in);
utf16_data[dest_len] = 0;
if (ret) if (ret)
{
utf16_data[dest_len] = 0;
strlcpy(s, (const char*)utf16_data, len); strlcpy(s, (const char*)utf16_data, len);
}
free(utf16_data); free(utf16_data);
utf16_data = NULL; utf16_data = NULL;