Merge pull request #299 from fjtrujy/fixSamplesGCC15

Fix majority of the warning in the PSPSDK samples

Author: sharkwouter

src/samples/debug/prxdecrypt/main.c

@@ -104,7 +104,7 @@ int extract_file(const char* name, const char* dstname)
 
 			if(size >= 0)
 			{
-				printf("Extracted file - size %d\n", size);
+				printf("Extracted file - size %ld\n", size);
 				fd = sceIoOpen(dstname, PSP_O_WRONLY | PSP_O_CREAT | PSP_O_TRUNC, 0777);
 				if(fd >= 0)
 				{

src/samples/gu/vertex/Makefile.sample

@@ -2,7 +2,7 @@ TARGET = vertex
 OBJS = vertex.o ../common/callbacks.o ../common/menu.o
 
 INCDIR =
-CFLAGS = -Wall
+CFLAGS = -Wall -ffast-math
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 

src/samples/gu/vertex/vertex.c

@@ -131,7 +131,7 @@ void generateVertexBuffer(int vertexFormat, void* vertices, int batchSize)
 		memset(current,0,vertexSize);
 
 		// TODO: render something nice
-/*
+
 		float x = cosf((i * batchScale) * (GU_PI*2));
 		float y = sinf((i * batchScale) * (GU_PI*2));
 
@@ -180,7 +180,7 @@ void generateVertexBuffer(int vertexFormat, void* vertices, int batchSize)
 			}
 			break;
 		}		
-*/
+
 		current = current + vertexSize;
 	}
 }
@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
 
 	// run sample
 
-	int val = 0;
+	int frame = 0;
 	SceCtrlData oldPad;
 	memset(&oldPad,0,sizeof(SceCtrlData));
 
@@ -598,7 +598,7 @@ int main(int argc, char* argv[])
 
 		pspDebugScreenSetOffset((int)fbp0);
 		pspDebugScreenSetXY(0,0);
-		pspDebugScreenPrintf("Mask: 0x%08x, Size: %u", vertexMask, vertexSize,val);
+		pspDebugScreenPrintf("Mask: 0x%08x, Size: %u, frame: %d", vertexMask, vertexSize, frame);
 		if (avgVertexSpeed)
 			pspDebugScreenPrintf(", %.2f million vertices / sec.",avgVertexSpeed);
 		else
@@ -613,7 +613,7 @@ int main(int argc, char* argv[])
 		fbp1 = fbp0;
 		fbp0 = sceGuSwapBuffers();
 
-		val++;
+		frame++;
 	}
 
 	sceGuTerm();

src/samples/kernel/kdumper/main.c

@@ -171,7 +171,7 @@ void dump_cop0_regs(void)
 	printf("Cop0 regs\n");
 	for(i = 0; i < 32; i+=4)
 	{
-		printf("$%02d: %08X, $%02d: %08X, $%02d: %08X $%02d: %08X\n", 
+		printf("$%02d: %08lX, $%02d: %08lX, $%02d: %08lX $%02d: %08lX\n", 
 				i, regs[i], i+1, regs[i+1], i+2, regs[i+2], i+3, regs[i+3]);
 	}
 }

src/samples/me/basic/main.c

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 		pspDebugScreenSetXY(0, 0);
 		pspDebugScreenPrintf("ME Basic Example, press Home to exit\n");
 		sceKernelDcacheWritebackInvalidateAll();
-		pspDebugScreenPrintf("ME Counter: %08x\n", *count);
+		pspDebugScreenPrintf("ME Counter: %08lx\n", *count);
 		sceCtrlReadBufferPositive(&ctl, 1);
 		if(ctl.Buttons & PSP_CTRL_HOME)
 		{

src/samples/net/simple/main.c

@@ -246,6 +246,8 @@ int net_thread(SceSize args, void *argp)
 			start_server(info.ip);
 		}
 	} while (0);
+
+	return 0;
 }
 /* Simple thread */
 int main(int argc, char **argv)

src/samples/net/wlanscan_elf/main.c

@@ -78,7 +78,6 @@ const char *caps[8] = {
 void print_apsum(struct ScanData *pData)
 {
 	char name[33];
-	int  loop;
 	strncpy(name, pData->name, 32);
 	name[32] = 0;
 	printf("RSSI:%02d  ", pData->rssi);

src/samples/prx/prx_loader/main.c

@@ -87,8 +87,8 @@ int main(void)
 	SceUID modid;
 	SceModule *mod;
 	int i;
-	int ret;
 	int fd;
+	int ret = -1;
 
 	pspDebugScreenInit();
 
@@ -126,5 +126,5 @@ int main(void)
 	/* Let's bug out */
 	sceKernelExitDeleteThread(0);
 
-	return 0;
+	return ret >= 0 ? 0 : ret;
 }

src/samples/savedata/decrypt/main.c

@@ -27,7 +27,8 @@ PSP_MODULE_INFO("SaveDecrypt", 0, 1, 1);
 #define printf pspDebugScreenPrintf
 
 const char *decrypted = "ms0:/PLAIN.BIN";
-#if 0
+#define USE_OLD_FORMAT 0
+#if USE_OLD_FORMAT
   /* Old format save with no key, supported by 1.0+ firmware */
   const char *encrypted = "ms0:/PSP/SAVEDATA/DATA111110000/DATA.BIN";
   const unsigned char *gamekey = NULL;
@@ -66,12 +67,16 @@ int main(int argc, char *argv[])
 
 	printf("Will decrypt: %s\n", encrypted);
 	printf("   Using key:");
-	if(gamekey) {
+#if USE_OLD_FORMAT
+	{
+		printf(" none");
+	}
+#else
+	{
 		for (i = 0; i < 0x10; i++)
 			printf(" %02x", gamekey[i]);
-	} else {
-		printf(" none");
 	}
+#endif	
 	printf("\n\n");
 	printf(" Output file: %s\n\n", decrypted);
 	printf("Press X to continue, or O to quit.\n\n");

src/samples/savedata/encrypt/main.c

@@ -26,7 +26,8 @@ PSP_MODULE_INFO("SaveEncrypt", 0, 1, 1);
 
 #define printf pspDebugScreenPrintf
 
-#if 0
+#define USE_OLD_FORMAT 0
+#if USE_OLD_FORMAT
   /* Old format save with no key, supported by 1.0+ firmware */
   const char *plaintext = "ms0:/PLAIN.BIN";
   const char *encrypted = "ms0:/PSP/SAVEDATA/DATA111110000/DATA.BIN";
@@ -71,12 +72,16 @@ int main(int argc, char *argv[])
 
 	printf(" Will encrypt: %s\n", plaintext);
 	printf("    Using key:");
-	if(gamekey) {
+#if USE_OLD_FORMAT
+	{
+		printf(" none");
+	}
+#else
+	{
 		for (i = 0; i < 0x10; i++)
 			printf(" %02x", gamekey[i]);
-	} else {
-		printf(" none");
 	}
+#endif	
 	printf("\n\n");
 	printf("  Output file: %s\n", encrypted);
 	printf("Update hashes: %s\n\n", paramsfo);