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

Consistency in variable naming conventions - rename temp_path to tmp_path

Browse Source 
for uniformity with rest of code
This commit is contained in:
libretroadmin 2022-07-05 19:06:38 +02:00
parent f12ad9ed34
commit fbd37f8926
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configuration.c
View File

@ -3925,7 +3925,7 @@ bool config_load_override(void *data)
/* Create a new config file from content_path */
if (config_file_exists(content_path))
{
char temp_path[PATH_MAX_LENGTH + 1];
char tmp_path[PATH_MAX_LENGTH + 1];
RARCH_LOG("[Overrides]: Content dir-specific overrides found at \"%s\".\n",
content_path);
@ -3933,7 +3933,7 @@ bool config_load_override(void *data)
if (should_append)
{
RARCH_LOG("[Overrides]: Content dir-specific overrides stacking on top of previous overrides.\n");
snprintf(temp_path, sizeof(temp_path),
snprintf(tmp_path, sizeof(tmp_path),
"%s|%s",
path_get(RARCH_PATH_CONFIG_APPEND),
content_path
@ -3941,11 +3941,11 @@ bool config_load_override(void *data)
}
else
{
temp_path[0] = '\0';
strlcpy(temp_path, content_path, sizeof(temp_path));
tmp_path[0] = '\0';
strlcpy(tmp_path, content_path, sizeof(tmp_path));
}
path_set(RARCH_PATH_CONFIG_APPEND, temp_path);
path_set(RARCH_PATH_CONFIG_APPEND, tmp_path);
should_append = true;
}
@ -3957,7 +3957,7 @@ bool config_load_override(void *data)
/* Create a new config file from game_path */
if (config_file_exists(game_path))
{
char temp_path[PATH_MAX_LENGTH + 1];
char tmp_path[PATH_MAX_LENGTH + 1];
RARCH_LOG("[Overrides]: Game-specific overrides found at \"%s\".\n",
game_path);
@ -3965,7 +3965,7 @@ bool config_load_override(void *data)
if (should_append)
{
RARCH_LOG("[Overrides]: Game-specific overrides stacking on top of previous overrides.\n");
snprintf(temp_path, sizeof(temp_path),
snprintf(tmp_path, sizeof(tmp_path),
"%s|%s",
path_get(RARCH_PATH_CONFIG_APPEND),
game_path
@ -3973,11 +3973,11 @@ bool config_load_override(void *data)
}
else
{
temp_path[0] = '\0';
strlcpy(temp_path, game_path, sizeof(temp_path));
tmp_path[0] = '\0';
strlcpy(tmp_path, game_path, sizeof(tmp_path));
}
path_set(RARCH_PATH_CONFIG_APPEND, temp_path);
path_set(RARCH_PATH_CONFIG_APPEND, tmp_path);
should_append = true;
}

8
runloop.c
View File

@ -1948,14 +1948,14 @@ bool runloop_environment_cb(unsigned cmd, void *data)
const char *fullpath = path_get(RARCH_PATH_CONTENT);
if (!string_is_empty(fullpath))
{
char temp_path[PATH_MAX_LENGTH];
temp_path[0] = '\0';
char tmp_path[PATH_MAX_LENGTH];
tmp_path[0] = '\0';
if (string_is_empty(dir_system))
RARCH_WARN("[Environ]: SYSTEM DIR is empty, assume CONTENT DIR %s\n",
fullpath);
fill_pathname_basedir(temp_path, fullpath, sizeof(temp_path));
dir_set(RARCH_DIR_SYSTEM, temp_path);
fill_pathname_basedir(tmp_path, fullpath, sizeof(tmp_path));
dir_set(RARCH_DIR_SYSTEM, tmp_path);
}
*(const char**)data = dir_get_ptr(RARCH_DIR_SYSTEM);

18
tasks/task_content.c
View File

@ -800,11 +800,11 @@ static bool content_file_extract_from_archive(
const char **content_path,
char **error_string)
{
const char *temp_path_ptr = NULL;
char temp_path[PATH_MAX_LENGTH];
const char *tmp_path_ptr = NULL;
char tmp_path[PATH_MAX_LENGTH];
char msg[1024];
temp_path[0] = '\0';
tmp_path[0] = '\0';
msg[0] = '\0';
RARCH_LOG("[Content]: Core requires uncompressed content - "
@ -815,7 +815,7 @@ static bool content_file_extract_from_archive(
*content_path, valid_exts,
string_is_empty(content_ctx->directory_cache) ?
NULL : content_ctx->directory_cache,
temp_path, sizeof(temp_path)))
tmp_path, sizeof(tmp_path)))
{
snprintf(msg, sizeof(msg), "%s: \"%s\".\n",
msg_hash_to_str(MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE),
@ -827,16 +827,16 @@ static bool content_file_extract_from_archive(
/* Add path of extracted file to temporary content
* list (so it can be deleted when deinitialising
* the core) */
temp_path_ptr = content_file_list_append_temporary(
p_content->content_list, temp_path);
if (!temp_path_ptr)
tmp_path_ptr = content_file_list_append_temporary(
p_content->content_list, tmp_path);
if (!tmp_path_ptr)
return false;
/* Update content path pointer */
*content_path = temp_path_ptr;
*content_path = tmp_path_ptr;
RARCH_LOG("[Content]: Content successfully extracted to: \"%s\".\n",
temp_path);
tmp_path);
return true;
}