Merge pull request #424 from negativeExponent/libretro

silence some warnings

5 files changed, 18 insertions, 10 deletions

diff --git a/frontend/main.c b/frontend/main.c
index 64be927..b1ee4c7 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 d877513..d42576c 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 35823da..bebec87 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
 
 /******************************************************************************/
 
diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index af6b80b..9c19bb6 100644
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -27,6 +27,8 @@ extern unsigned char CALLBACK PAD2__startPoll(int pad);
 extern unsigned char CALLBACK PAD1__poll(unsigned char value);
 extern unsigned char CALLBACK PAD2__poll(unsigned char value);
 
+#ifndef HAVE_LIBRETRO
+
 static int old_controller_type1 = -1, old_controller_type2 = -1;
 
 #define select_pad(n) \
@@ -40,12 +42,12 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			pad_init(); \
 			break; \
 		case PSE_PAD_TYPE_GUNCON: \
-			//Removed for new Guncon functionality, may have been required for very old touchscreen support
-			//PAD##n##_startPoll = PADstartPoll_guncon; \
-			//PAD##n##_poll = PADpoll_guncon; \
-			//guncon_init(); \
-			//break; \
-                case PSE_PAD_TYPE_NEGCON: \
+			/* Removed for new Guncon functionality, may have been required for very old touchscreen support */ \
+			/* PAD##n##_startPoll = PADstartPoll_guncon; */ \
+			/* PAD##n##_poll = PADpoll_guncon; */ \
+			/* guncon_init(); */ \
+			/* break; */ \
+		case PSE_PAD_TYPE_NEGCON: \
 		case PSE_PAD_TYPE_GUN: \
 		default: \
 			PAD##n##_startPoll = PAD##n##__startPoll; \
@@ -53,6 +55,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			break; \
 		} \
 	}
+#endif /* HAVE_LIBRETRO */
 
 
 void dfinput_activate(void)
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 853c8c8..3e33366 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -42,6 +42,7 @@ enum {
 	CMD_VIBRATION_TOGGLE = 0x4D,
 };
 
+#ifndef HAVE_LIBRETRO
 static struct {
 	uint8_t PadMode;
 	uint8_t PadID;
@@ -242,6 +243,7 @@ static void do_vibration(unsigned char value)
             break;
     }
 }
+#endif
 
 #if 0
 #include <stdio.h>