From ab9dd5372e9aa5502f0c64fd4a9325fdf4e6619d Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 30 Oct 2022 02:00:38 +0100 Subject: [PATCH] Fixed all warnings in config.c. --- src/config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config.c b/src/config.c index e4da13422..2c20131c3 100644 --- a/src/config.c +++ b/src/config.c @@ -196,7 +196,7 @@ load_general(void) video_framerate = ini_section_get_int(cat, "video_gl_framerate", -1); video_vsync = ini_section_get_int(cat, "video_gl_vsync", 0); - strncpy(video_shader, ini_section_get_string(cat, "video_gl_shader", ""), sizeof(video_shader)); + strncpy(video_shader, ini_section_get_string(cat, "video_gl_shader", ""), sizeof(video_shader) - 1); window_remember = ini_section_get_int(cat, "window_remember", 0); if (window_remember) { @@ -692,7 +692,7 @@ load_sound(void) if (strlen(p) > 511) fatal("load_sound(): strlen(p) > 511\n"); else - strncpy(temp, p, strlen(p) + 1); + strncpy(temp, p, 511); if (!strcmp(temp, "float") || !strcmp(temp, "1")) sound_is_float = 1; else @@ -913,12 +913,12 @@ load_storage_controllers(void) if (strlen(p) > 511) fatal("load_storage_controllers(): strlen(p) > 511\n"); else - strncpy(cassette_fname, p, MIN(512, strlen(p) + 1)); + strncpy(cassette_fname, p, 511); p = ini_section_get_string(cat, "cassette_mode", ""); if (strlen(p) > 511) fatal("load_storage_controllers(): strlen(p) > 511\n"); else - strncpy(cassette_mode, p, MIN(512, strlen(p) + 1)); + strncpy(cassette_mode, p, 511); cassette_pos = ini_section_get_int(cat, "cassette_position", 0); cassette_srate = ini_section_get_int(cat, "cassette_srate", 44100); cassette_append = !!ini_section_get_int(cat, "cassette_append", 0); @@ -949,7 +949,7 @@ load_storage_controllers(void) if (strlen(p) > 511) fatal("load_storage_controllers(): strlen(p) > 511\n"); else - strncpy(cart_fns[c], p, strlen(p) + 1); + strncpy(cart_fns[c], p, 511); } } @@ -1197,7 +1197,7 @@ load_floppy_drives(void) if (strlen(p) > 511) fatal("load_floppy_drives(): strlen(p) > 511\n"); else - strncpy(floppyfns[c], p, strlen(p) + 1); + strncpy(floppyfns[c], p, 511); /* if (*wp != L'\0') config_log("Floppy%d: %ls\n", c, floppyfns[c]); */ @@ -1259,7 +1259,7 @@ load_floppy_and_cdrom_drives(void) if (strlen(p) > 511) fatal("load_floppy_and_cdrom_drives(): strlen(p) > 511\n"); else - strncpy(floppyfns[c], p, strlen(p) + 1); + strncpy(floppyfns[c], p, 511); /* if (*wp != L'\0') config_log("Floppy%d: %ls\n", c, floppyfns[c]); */