From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Sat, 23 May 2020 04:09:11 +0000 (+0800)
Subject: Silence some warnings
X-Git-Tag: r24l~640^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7da20a2de9b8dcd266e2d69b13259cb364d451;p=pcsx_rearmed.git

Silence some warnings

Silences some [-Wformat-truncation=] and [-Wstringop-truncation]
---

diff --git a/frontend/main.c b/frontend/main.c
index 64be927e..b1ee4c7d 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -307,7 +307,7 @@ static int cdidcmp(const char *id1, const char *id2)
 
 static void parse_cwcheat(void)
 {
-	char line[256], buf[64], name[64], *p;
+	char line[256], buf[256], name[256], *p;
 	int newcheat = 1;
 	u32 a, v;
 	FILE *f;
@@ -883,8 +883,9 @@ static int _OpenPlugins(void) {
 		MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
 
 		strcpy(info.EmuName, "PCSX");
-		strncpy(info.CdromID, CdromId, 9);
-		strncpy(info.CdromLabel, CdromLabel, 9);
+		memcpy(info.CdromID, CdromId, 9); /* no \0 trailing character? */
+		memcpy(info.CdromLabel, CdromLabel, 9);
+		info.CdromLabel[9] = '\0';
 		info.psxMem = psxM;
 		info.GPU_showScreenPic = GPU_showScreenPic;
 		info.GPU_displayText = GPU_displayText;
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index d877513b..d42576c8 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -392,7 +392,7 @@ int CheckCdrom() {
 	}
 
 	if (CdromLabel[0] == ' ') {
-		strncpy(CdromLabel, CdromId, 9);
+		memcpy(CdromLabel, CdromId, 9);
 	}
 	SysPrintf(_("CD-ROM Label: %.32s\n"), CdromLabel);
 	SysPrintf(_("CD-ROM ID: %.9s\n"), CdromId);
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 35823dac..bebec876 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -64,7 +64,9 @@ static const u32 HSyncTotal[]     = { 263, 313 };
 #define VBlankStart 240
 
 #define VERBOSE_LEVEL 0
+#if VERBOSE_LEVEL > 0
 static const s32 VerboseLevel     = VERBOSE_LEVEL;
+#endif
 
 /******************************************************************************/