aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorretro-wertz2019-08-03 20:56:36 +0800
committerretro-wertz2019-08-03 20:56:36 +0800
commite6f1e7f70c3ee3816e417f97aef1501a1f950976 (patch)
tree99b4ed96c372825a41018465bfddf907a48084ad
parent6e522b2b410e29bc2984d621dd368aa2d2d489af (diff)
downloadpcsx_rearmed-e6f1e7f70c3ee3816e417f97aef1501a1f950976.tar.gz
pcsx_rearmed-e6f1e7f70c3ee3816e417f97aef1501a1f950976.tar.bz2
pcsx_rearmed-e6f1e7f70c3ee3816e417f97aef1501a1f950976.zip
Silence a few more warnings
- silence a few more truncated warnings - change "disable" to "disabled" in core options
-rw-r--r--frontend/libretro.c6
-rw-r--r--frontend/libretro_core_options.h4
-rw-r--r--libpcsxcore/plugins.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c
index b8d17ab..bdf0829 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -962,11 +962,11 @@ static struct retro_disk_control_callback disk_control = {
#define PATH_MAX 4096
#endif
-static char base_dir[PATH_MAX];
+static char base_dir[1024];
static bool read_m3u(const char *file)
{
- char line[PATH_MAX];
+ char line[1024];
char name[PATH_MAX];
FILE *f = fopen(file, "r");
if (!f)
@@ -2130,7 +2130,7 @@ static int init_memcards(void)
static void loadPSXBios(void)
{
const char *dir;
- char path[256];
+ char path[PATH_MAX];
unsigned useHLE = 0;
const char *bios[] = {
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index 6513e1c..f0bd902 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -77,11 +77,11 @@ struct retro_core_option_definition option_defs_us[] = {
"Enable Second Memory Card (Shared)",
"Enabled the memory card slot 2. This memory card is shared amongst all games.",
{
- { "disable", NULL },
+ { "disabled", NULL },
{ "enabled", NULL },
{ NULL, NULL},
},
- "disable",
+ "disabled",
},
{
"pcsx_rearmed_pad1type",
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 0c2b190..af7ebed 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -1182,7 +1182,7 @@ void SetIsoFile(const char *filename) {
IsoFile[0] = '\0';
return;
}
- strncpy(IsoFile, filename, MAXPATHLEN);
+ strncpy(IsoFile, filename, MAXPATHLEN - 1);
}
const char *GetIsoFile(void) {