mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify task_database_cue.c code -

Browse Source 
* Was copying pre_game_id into several memory buffers for no real reason,
gets rid of some unnecessary strncpy calls this way too
This commit is contained in:
LibretroAdmin 2022-08-25 07:15:27 +02:00
parent 88187e7ef2
commit f5ac33c0b6
1 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tasks/task_database_cue.c
View File

@ -458,10 +458,7 @@ int detect_scd_game(intfstream_t *fd, char *s, size_t len, const char *filename)
size_t _len; size_t _len;
char pre_game_id[SCD_SERIAL_LEN+1]; char pre_game_id[SCD_SERIAL_LEN+1];
char raw_game_id[SCD_SERIAL_LEN+1]; char raw_game_id[SCD_SERIAL_LEN+1];
char check_prefix_t_hyp[10];
char check_suffix_50[10]; char check_suffix_50[10];
char check_prefix_g_hyp[10];
char check_prefix_mk_hyp[10];
char region_id; char region_id;
size_t length; size_t length;
int lengthref; int lengthref;
@ -497,17 +494,11 @@ int detect_scd_game(intfstream_t *fd, char *s, size_t len, const char *filename)
/** Dissect this pre serial into parts **/ /** Dissect this pre serial into parts **/
length = strlen(pre_game_id); length = strlen(pre_game_id);
lengthref = length - 2; lengthref = length - 2;
strncpy(check_prefix_t_hyp, pre_game_id, 2);
check_prefix_t_hyp[2] = '\0';
strncpy(check_prefix_g_hyp, pre_game_id, 2);
check_prefix_g_hyp[2] = '\0';
strncpy(check_prefix_mk_hyp, pre_game_id, 3);
check_prefix_mk_hyp[3] = '\0';
strncpy(check_suffix_50, &pre_game_id[lengthref], length - 2 + 1); strncpy(check_suffix_50, &pre_game_id[lengthref], length - 2 + 1);
check_suffix_50[2] = '\0'; check_suffix_50[2] = '\0';
/** redump serials are built differently for each prefix **/ /** redump serials are built differently for each prefix **/
if (check_prefix_t_hyp[0] == 'T' && check_prefix_t_hyp[1] == '-') if (pre_game_id[0] == 'T' && pre_game_id[1] == '-')
{ {
if (region_id == 'U' || region_id == 'J') if (region_id == 'U' || region_id == 'J')
{ {
@ -530,7 +521,7 @@ int detect_scd_game(intfstream_t *fd, char *s, size_t len, const char *filename)
cue_append_multi_disc_suffix(s, filename); cue_append_multi_disc_suffix(s, filename);
return true; return true;
} }
else if (check_prefix_g_hyp[0] == 'G' && check_prefix_g_hyp[1] == '-') else if (pre_game_id[0] == 'G' && pre_game_id[1] == '-')
{ {
if ((index = string_index_last_occurance(pre_game_id, '-')) == -1) if ((index = string_index_last_occurance(pre_game_id, '-')) == -1)
return false; return false;
@ -539,9 +530,9 @@ int detect_scd_game(intfstream_t *fd, char *s, size_t len, const char *filename)
cue_append_multi_disc_suffix(s, filename); cue_append_multi_disc_suffix(s, filename);
return true; return true;
} }
else if (check_prefix_mk_hyp[0] == 'M' else if (pre_game_id[0] == 'M'
&& check_prefix_mk_hyp[1] == 'K' && pre_game_id[1] == 'K'
&& check_prefix_mk_hyp[2] == '-') && pre_game_id[2] == '-')
{ {
if ( check_suffix_50[0] == '5' if ( check_suffix_50[0] == '5'
&& check_suffix_50[1] == '0') && check_suffix_50[1] == '0')
@ -578,8 +569,6 @@ int detect_sat_game(intfstream_t *fd, char *s, size_t len, const char *filename)
size_t _len; size_t _len;
char raw_game_id[SAT_SERIAL_LEN+1]; char raw_game_id[SAT_SERIAL_LEN+1];
char region_id; char region_id;
char check_prefix_t_hyp[10];
char check_prefix_mk_hyp[10];
char check_suffix_5[10]; char check_suffix_5[10];
char check_suffix_50[10]; char check_suffix_50[10];
int length; int length;
@ -614,10 +603,6 @@ int detect_sat_game(intfstream_t *fd, char *s, size_t len, const char *filename)
string_trim_whitespace(raw_game_id); string_trim_whitespace(raw_game_id);
/** Dissect this raw serial into parts **/ /** Dissect this raw serial into parts **/
strncpy(check_prefix_t_hyp, raw_game_id, 2);
check_prefix_t_hyp[2] = '\0';
strncpy(check_prefix_mk_hyp, raw_game_id, 3);
check_prefix_mk_hyp[3] = '\0';
length = strlen(raw_game_id); length = strlen(raw_game_id);
strncpy(check_suffix_5, &raw_game_id[length - 2], 2); strncpy(check_suffix_5, &raw_game_id[length - 2], 2);
check_suffix_5[2] = '\0'; check_suffix_5[2] = '\0';
@ -628,9 +613,9 @@ int detect_sat_game(intfstream_t *fd, char *s, size_t len, const char *filename)
switch (region_id) switch (region_id)
{ {
case 'U': case 'U':
if ( check_prefix_mk_hyp[0] == 'M' if ( raw_game_id[0] == 'M'
&& check_prefix_mk_hyp[1] == 'K' && raw_game_id[1] == 'K'
&& check_prefix_mk_hyp[2] == '-') && raw_game_id[2] == '-')
{ {
strncpy(s, &raw_game_id[3], length - 3); strncpy(s, &raw_game_id[3], length - 3);
s[length - 3] = '\0'; s[length - 3] = '\0';
@ -682,10 +667,6 @@ int detect_dc_game(intfstream_t *fd, char *s, size_t len, const char *filename)
int total_hyphens_recalc; int total_hyphens_recalc;
char pre_game_id[50]; char pre_game_id[50];
char raw_game_id[50]; char raw_game_id[50];
char check_prefix_t_hyp[10];
char check_prefix_t[10];
char check_prefix_hdr_hyp[10];
char check_prefix_mk_hyp[10];
size_t length; size_t length;
size_t length_recalc; size_t length_recalc;
int index; int index;
@ -717,19 +698,9 @@ int detect_dc_game(intfstream_t *fd, char *s, size_t len, const char *filename)
length = strlen(raw_game_id); length = strlen(raw_game_id);
total_hyphens = string_count_occurrences_single_character(raw_game_id, '-'); total_hyphens = string_count_occurrences_single_character(raw_game_id, '-');
/** Dissect this raw serial into parts **/
strncpy(check_prefix_t_hyp, raw_game_id, 2);
check_prefix_t_hyp[2] = '\0';
strncpy(check_prefix_t, raw_game_id, 1);
check_prefix_t[1] = '\0';
strncpy(check_prefix_hdr_hyp, raw_game_id, 4);
check_prefix_hdr_hyp[4] = '\0';
strncpy(check_prefix_mk_hyp, raw_game_id, 3);
check_prefix_mk_hyp[3] = '\0';
/** redump serials are built differently for each prefix **/ /** redump serials are built differently for each prefix **/
if ( check_prefix_t_hyp[0] == 'T' if ( raw_game_id[0] == 'T'
&& check_prefix_t_hyp[1] == '-') && raw_game_id[1] == '-')
{ {
if (total_hyphens >= 2) if (total_hyphens >= 2)
{ {
@ -766,7 +737,7 @@ int detect_dc_game(intfstream_t *fd, char *s, size_t len, const char *filename)
cue_append_multi_disc_suffix(s, filename); cue_append_multi_disc_suffix(s, filename);
return true; return true;
} }
else if (check_prefix_t[0] == 'T') else if (raw_game_id[0] == 'T')
{ {
strncpy(lgame_id, raw_game_id, 1); strncpy(lgame_id, raw_game_id, 1);
lgame_id[1] = '\0'; lgame_id[1] = '\0';
@ -817,10 +788,10 @@ int detect_dc_game(intfstream_t *fd, char *s, size_t len, const char *filename)
} }
return true; return true;
} }
else if (check_prefix_hdr_hyp[0] == 'H' else if (raw_game_id[0] == 'H'
&& check_prefix_hdr_hyp[1] == 'D' && raw_game_id[1] == 'D'
&& check_prefix_hdr_hyp[2] == 'R' && raw_game_id[2] == 'R'
&& check_prefix_hdr_hyp[3] == '-') && raw_game_id[3] == '-')
{ {
if (total_hyphens >= 2) if (total_hyphens >= 2)
{ {
@ -842,9 +813,9 @@ int detect_dc_game(intfstream_t *fd, char *s, size_t len, const char *filename)
cue_append_multi_disc_suffix(s, filename); cue_append_multi_disc_suffix(s, filename);
return true; return true;
} }
else if (check_prefix_mk_hyp[0] == 'M' else if (raw_game_id[0] == 'M'
&& check_prefix_mk_hyp[1] == 'K' && raw_game_id[1] == 'K'
&& check_prefix_mk_hyp[2] == '-') && raw_game_id[2] == '-')
{ {
if (length <= 8) if (length <= 8)