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

No need to free a known null...

Browse Source
This commit is contained in:
Alcaro 2015-11-20 16:33:21 +01:00
parent 4b96b5814f
commit 888ba881ec
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dynamic.c
View File

@ -618,8 +618,8 @@ static bool rarch_game_specific_options(char **output)
if (core_name[0] == '\0' || game_name[0] == '\0') if (core_name[0] == '\0' || game_name[0] == '\0')
return false; return false;
RARCH_LOG("Per-game Options: core name: %s\n", core_name); RARCH_LOG("Per-Game Options: core name: %s\n", core_name);
RARCH_LOG("Per-game Options: game name: %s\n", game_name); RARCH_LOG("Per-Game Options: game name: %s\n", game_name);
/* Config directory: config_directory. /* Config directory: config_directory.
@ -631,7 +631,7 @@ static bool rarch_game_specific_options(char **output)
fill_pathname_basedir(config_directory, global->path.config, PATH_MAX_LENGTH); fill_pathname_basedir(config_directory, global->path.config, PATH_MAX_LENGTH);
else else
{ {
RARCH_WARN("Per-game Options: no config directory set\n"); RARCH_WARN("Per-Game Options: no config directory set\n");
return false; return false;
} }
@ -642,13 +642,12 @@ static bool rarch_game_specific_options(char **output)
strlcat(game_path, ".opt", PATH_MAX_LENGTH); strlcat(game_path, ".opt", PATH_MAX_LENGTH);
option_file = config_file_new(game_path); option_file = config_file_new(game_path);
if(option_file) if (option_file)
{ {
RARCH_LOG("Per-game options: game-specific core options found at %s\n", game_path); RARCH_LOG("Per-Game Options: game-specific core options found at %s\n", game_path);
*output = game_path; *output = game_path;
return true; return true;
} }
config_file_free(option_file);
return false; return false;
} }

2
libretro-common/file/file_path.c
View File

@ -572,7 +572,7 @@ void fill_pathname_resolve_relative(char *out_path,
void fill_pathname_join(char *out_path, void fill_pathname_join(char *out_path,
const char *dir, const char *path, size_t size) const char *dir, const char *path, size_t size)
{ {
if (out_path!=dir) if (out_path != dir)
retro_assert(strlcpy(out_path, dir, size) < size); retro_assert(strlcpy(out_path, dir, size) < size);
if (*out_path) if (*out_path)