libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(input_common.c) Use fill_pathname_join_delim

Browse Source
This commit is contained in:
twinaphex 2015-06-22 20:40:11 +02:00
parent 501e4e08af
commit a4d1d91281
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command_event.c
View File

@ -908,8 +908,7 @@ static void event_main_state(unsigned cmd)
snprintf(path, sizeof(path), "%s%d",
global->savestate_name, settings->state_slot);
else if (settings->state_slot < 0)
snprintf(path, sizeof(path), "%s.auto",
global->savestate_name);
fill_pathname_join_delim(path, global->savestate_name, "auto", '.', sizeof(path));
else
strlcpy(path, global->savestate_name, sizeof(path));

16
input/input_common.c
View File

@ -20,6 +20,8 @@
#include <stdlib.h>
#include <ctype.h>
#include <file/file_path.h>
#include "../general.h"
#ifdef HAVE_CONFIG_H
#include "../config.h"
@ -169,7 +171,7 @@ void input_config_parse_key(config_file_t *conf,
{
char tmp[64] = {0};
char key[64] = {0};
snprintf(key, sizeof(key), "%s_%s", prefix, btn);
fill_pathname_join_delim(key, prefix, btn, '_', sizeof(key));
if (config_get_array(conf, key, tmp, sizeof(tmp)))
bind->key = input_translate_str_to_rk(tmp);
@ -268,13 +270,15 @@ static void parse_hat(struct retro_keybind *bind, const char *str)
void input_config_parse_joy_button(config_file_t *conf, const char *prefix,
const char *btn, struct retro_keybind *bind)
{
char str[256] = {0};
char tmp[64] = {0};
char key[64] = {0};
char key_label[64] = {0};
char *tmp_a = NULL;
snprintf(key, sizeof(key), "%s_%s_btn", prefix, btn);
snprintf(key_label, sizeof(key_label), "%s_%s_btn_label", prefix, btn);
fill_pathname_join_delim(str, prefix, btn, '_', sizeof(str));
fill_pathname_join_delim(key, str, "btn", '_', sizeof(key));
fill_pathname_join_delim(key_label, str, "btn_label", '_', sizeof(key_label));
if (config_get_array(conf, key, tmp, sizeof(tmp)))
{
@ -297,13 +301,15 @@ void input_config_parse_joy_button(config_file_t *conf, const char *prefix,
void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
const char *axis, struct retro_keybind *bind)
{
char str[256] = {0};
char tmp[64] = {0};
char key[64] = {0};
char key_label[64] = {0};
char *tmp_a = NULL;
snprintf(key, sizeof(key), "%s_%s_axis", prefix, axis);
snprintf(key_label, sizeof(key_label), "%s_%s_axis_label", prefix, axis);
fill_pathname_join_delim(str, prefix, axis, '_', sizeof(str));
fill_pathname_join_delim(key, str, "axis", '_', sizeof(key));
fill_pathname_join_delim(key_label, str, "axis_label", '_', sizeof(key_label));
if (config_get_array(conf, key, tmp, sizeof(tmp)))
{