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

OSX buildfixes/cleanups

Browse Source
This commit is contained in:
Twinaphex 2017-09-19 21:37:51 +02:00
parent e8f39f004e
commit 9a76a93ea8
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tasks/task_database.c
View File

@ -384,14 +384,10 @@ static int stream_get_crc(intfstream_t *fd, uint32_t *crc)
uint8_t buffer[4096]; uint8_t buffer[4096];
while ((read = intfstream_read(fd, buffer, sizeof(buffer))) > 0) while ((read = intfstream_read(fd, buffer, sizeof(buffer))) > 0)
{
acc = encoding_crc32(acc, buffer, read); acc = encoding_crc32(acc, buffer, read);
}
if (read < 0) if ( sread < 0)
{
return 0; return 0;
}
*crc = acc; *crc = acc;
@ -448,12 +444,11 @@ static bool file_get_crc(const char *name, size_t offset, size_t size, uint32_t
static int cue_get_crc(const char *name, uint32_t *crc) static int cue_get_crc(const char *name, uint32_t *crc)
{ {
char *track_path = (char *)malloc(PATH_MAX_LENGTH); char *track_path = (char *)malloc(PATH_MAX_LENGTH);
int ret = 0; size_t offset = 0;
size_t offset = 0; size_t size = 0;
size_t size = 0; int rv = 0;
int rv = 0;
track_path[0] = '\0'; track_path[0] = '\0';
rv = cue_find_track(name, false, &offset, &size, track_path, PATH_MAX_LENGTH); rv = cue_find_track(name, false, &offset, &size, track_path, PATH_MAX_LENGTH);
@ -469,7 +464,8 @@ static int cue_get_crc(const char *name, uint32_t *crc)
RARCH_LOG("%s\n", msg_hash_to_str(MSG_READING_FIRST_DATA_TRACK)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_READING_FIRST_DATA_TRACK));
rv = file_get_crc(track_path, offset, size, crc); rv = file_get_crc(track_path, offset, size, crc);
if (rv == 1) { if (rv == 1)
{
RARCH_LOG("CUE '%s' crc: %x\n", name, *crc); RARCH_LOG("CUE '%s' crc: %x\n", name, *crc);
} }
free(track_path); free(track_path);
@ -479,14 +475,14 @@ static int cue_get_crc(const char *name, uint32_t *crc)
static int gdi_get_crc(const char *name, uint32_t *crc) static int gdi_get_crc(const char *name, uint32_t *crc)
{ {
char *track_path = (char *)malloc(PATH_MAX_LENGTH); char *track_path = (char *)malloc(PATH_MAX_LENGTH);
int ret = 0; int rv = 0;
int rv = 0;
track_path[0] = '\0'; track_path[0] = '\0';
rv = gdi_find_track(name, false, track_path, PATH_MAX_LENGTH); rv = gdi_find_track(name, false, track_path, PATH_MAX_LENGTH);
if (rv < 0) { if (rv < 0)
{
RARCH_LOG("%s: %s\n", msg_hash_to_str(MSG_COULD_NOT_FIND_VALID_DATA_TRACK), RARCH_LOG("%s: %s\n", msg_hash_to_str(MSG_COULD_NOT_FIND_VALID_DATA_TRACK),
strerror(-rv)); strerror(-rv));
free(track_path); free(track_path);
@ -498,7 +494,8 @@ static int gdi_get_crc(const char *name, uint32_t *crc)
RARCH_LOG("%s\n", msg_hash_to_str(MSG_READING_FIRST_DATA_TRACK)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_READING_FIRST_DATA_TRACK));
rv = file_get_crc(track_path, 0, SIZE_MAX, crc); rv = file_get_crc(track_path, 0, SIZE_MAX, crc);
if (rv == 1) { if (rv == 1)
{
RARCH_LOG("GDI '%s' crc: %x\n", name, *crc); RARCH_LOG("GDI '%s' crc: %x\n", name, *crc);
} }
free(track_path); free(track_path);
@ -508,7 +505,6 @@ static int gdi_get_crc(const char *name, uint32_t *crc)
static bool chd_get_crc(const char *name, uint32_t *crc) static bool chd_get_crc(const char *name, uint32_t *crc)
{ {
int rv; int rv;
uint32_t acc = 0;
intfstream_t *fd = open_chd_track(name, CHDSTREAM_TRACK_PRIMARY); intfstream_t *fd = open_chd_track(name, CHDSTREAM_TRACK_PRIMARY);
if (!fd) if (!fd)
return 0; return 0;

2
tasks/task_database_cue.c
View File

@ -545,7 +545,6 @@ bool cue_next_file(intfstream_t *fd, const char *cue_path, char *path, size_t ma
{ {
bool rv = false; bool rv = false;
char *tmp_token = (char*)malloc(MAX_TOKEN_LEN); char *tmp_token = (char*)malloc(MAX_TOKEN_LEN);
ssize_t volatile file_size = -1;
char *cue_dir = (char*)malloc(PATH_MAX_LENGTH); char *cue_dir = (char*)malloc(PATH_MAX_LENGTH);
cue_dir[0] = '\0'; cue_dir[0] = '\0';
@ -576,7 +575,6 @@ int gdi_find_track(const char *gdi_path, bool first, char *track_path, size_t ma
char *tmp_token = (char*)malloc(MAX_TOKEN_LEN); char *tmp_token = (char*)malloc(MAX_TOKEN_LEN);
char *last_file = (char*)malloc(PATH_MAX_LENGTH + 1); char *last_file = (char*)malloc(PATH_MAX_LENGTH + 1);
intfstream_t *fd = NULL; intfstream_t *fd = NULL;
int32_t track = 0;
size_t largest = 0; size_t largest = 0;
int size = -1; int size = -1;
int mode = -1; int mode = -1;