diff options
| author | hizzlekizzle | 2019-08-03 08:33:29 -0500 |
|---|---|---|
| committer | GitHub | 2019-08-03 08:33:29 -0500 |
| commit | 0c510f87cbd5c7089e66ab09ffb7570073c1f63c (patch) | |
| tree | 99b4ed96c372825a41018465bfddf907a48084ad /frontend | |
| parent | fcb84f0c6ad095c355d8c0835fc6c5fcdc2a6813 (diff) | |
| parent | e6f1e7f70c3ee3816e417f97aef1501a1f950976 (diff) | |
| download | pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.tar.gz pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.tar.bz2 pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.zip | |
Merge pull request #326 from retro-wertz/silence_warnings
silence warnings and a few core fixes
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/libretro.c | 6 | ||||
| -rw-r--r-- | frontend/libretro_core_options.h | 4 | ||||
| -rw-r--r-- | frontend/main.c | 2 |
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/frontend/main.c b/frontend/main.c index c0bfd0f..81a68e3 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -870,7 +870,7 @@ static int _OpenPlugins(void) { if (Config.UseNet && !NetOpened) { netInfo info; - char path[MAXPATHLEN]; + char path[MAXPATHLEN * 2]; char dotdir[MAXPATHLEN]; MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL); |