mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-09 22:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Cleanup - it shouldn't be necessary to call fill_pathname_slash"

Browse Source 
This reverts commit 419fe62da8607214d2aabddfa4ca8c563ad81b19.
This commit is contained in:
twinaphex 2019-09-16 20:40:08 +02:00
parent 86839db417
commit 4354ad296d
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
file_path_special.c
View File

@ -169,14 +169,23 @@ void fill_pathname_application_special(char *s,
#ifdef HAVE_XMB #ifdef HAVE_XMB
{ {
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *s2 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
s1[0] = '\0'; s1[0] = '\0';
s2[0] = '\0';
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB); APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
fill_pathname_join(s, s1, "png", len); fill_pathname_join(s2, s1, "png",
PATH_MAX_LENGTH * sizeof(char)
);
fill_pathname_slash(s2,
PATH_MAX_LENGTH * sizeof(char)
);
strlcpy(s, s2, len);
free(s1); free(s1);
free(s2);
} }
#endif #endif
break; break;
@ -311,6 +320,9 @@ void fill_pathname_application_special(char *s,
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI); APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
fill_pathname_slash(s1,
PATH_MAX_LENGTH * sizeof(char)
);
strlcpy(s, s1, len); strlcpy(s, s1, len);
free(s1); free(s1);
@ -361,34 +373,52 @@ void fill_pathname_application_special(char *s,
case APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS: case APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS:
{ {
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *s2 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
s1[0] = '\0'; s1[0] = '\0';
s2[0] = '\0';
fill_pathname_join(s1, fill_pathname_join(s1,
settings->paths.directory_thumbnails, settings->paths.directory_thumbnails,
"discord", "discord",
len); len);
fill_pathname_join(s, fill_pathname_join(s2,
s1, "avatars", len); s1, "avatars",
PATH_MAX_LENGTH * sizeof(char)
);
fill_pathname_slash(s2,
PATH_MAX_LENGTH * sizeof(char)
);
strlcpy(s, s2, len);
free(s1); free(s1);
free(s2);
} }
break; break;
case APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES: case APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES:
{ {
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *s2 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
s1[0] = '\0'; s1[0] = '\0';
s2[0] = '\0';
fill_pathname_join(s1, fill_pathname_join(s1,
settings->paths.directory_thumbnails, settings->paths.directory_thumbnails,
"cheevos", "cheevos",
len); len);
fill_pathname_join(s, fill_pathname_join(s2,
s1, "badges", len); s1, "badges",
PATH_MAX_LENGTH * sizeof(char)
);
fill_pathname_slash(s2,
PATH_MAX_LENGTH * sizeof(char)
);
strlcpy(s, s2, len);
free(s1); free(s1);
free(s2);
} }
break; break;