diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 06:19:35 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 06:19:35 +0000 |
| commit | fd6e2e2b6ccb5474df022d76c9b9c23508ba787d (patch) | |
| tree | 2f90db9624e789e0169659bad1f165e5a34f21db /libpcsxcore | |
| parent | 302832eabec2f062591162840da9dbe9a127f780 (diff) | |
| download | pcsxr-fd6e2e2b6ccb5474df022d76c9b9c23508ba787d.tar.gz | |
Fix some minor warnings on SysPrintf and SysMessage use in libpcsxcore.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85929 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore')
| -rwxr-xr-x | libpcsxcore/debug.c | 8 | ||||
| -rwxr-xr-x | libpcsxcore/misc.c | 2 | ||||
| -rwxr-xr-x | libpcsxcore/plugins.c | 6 | ||||
| -rwxr-xr-x | libpcsxcore/psxbios.c | 6 | ||||
| -rwxr-xr-x | libpcsxcore/psxhle.c | 2 | ||||
| -rwxr-xr-x | libpcsxcore/psxmem.c | 2 | ||||
| -rwxr-xr-x | libpcsxcore/sio.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c index 99d2a53a..2a9bd5a4 100755 --- a/libpcsxcore/debug.c +++ b/libpcsxcore/debug.c @@ -318,23 +318,23 @@ void StartDebugger() { MemoryMap = (u8 *)malloc(0x200000); if (MemoryMap == NULL) { - SysMessage(_("Error allocating memory")); + SysMessage("%s", _("Error allocating memory")); return; } if (StartServer() == -1) { - SysPrintf(_("Unable to start debug server.\n")); + SysPrintf("%s", _("Unable to start debug server.\n")); return; } - SysPrintf(_("Debugger started.\n")); + SysPrintf("%s", _("Debugger started.\n")); debugger_active = 1; } void StopDebugger() { if (debugger_active) { StopServer(); - SysPrintf(_("Debugger stopped.\n")); + SysPrintf("%s", _("Debugger stopped.\n")); } if (MemoryMap != NULL) { diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 47c8f85e..750b54e8 100755 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -483,7 +483,7 @@ int Load(const char *ExePath) { break; case INVALID_EXE: - SysPrintf(_("This file does not appear to be a valid PSX file.\n")); + SysPrintf("%s", _("This file does not appear to be a valid PSX file.\n")); retval = -1; break; } diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 5d7c5220..05770154 100755 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -729,7 +729,7 @@ void CALLBACK clearDynarec(void) { } int LoadPlugins() { - int ret; + long ret; char Plugin[MAXPATHLEN]; ReleasePlugins(); @@ -787,13 +787,13 @@ int LoadPlugins() { if (ret < 0) { SysMessage (_("Error initializing SIO1 plugin: %d"), ret); return -1; } #endif - SysPrintf(_("Plugins loaded.\n")); + SysPrintf("%s", _("Plugins loaded.\n")); return 0; } void ReleasePlugins() { if (Config.UseNet) { - int ret = NET_close(); + long ret = NET_close(); if (ret < 0) Config.UseNet = FALSE; } NetOpened = FALSE; diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index 5fde5ad6..401c6f0a 100755 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -933,7 +933,7 @@ void psxBios_InitHeap() { // 0x39 heap_end = (u32 *)((u8 *)heap_addr + size); *heap_addr = SWAP32(size | 1); - SysPrintf("InitHeap %x,%x : %x %x\n",a0,a1, (uptr)heap_addr-(uptr)psxM, size); + SysPrintf("InitHeap %x,%x : %lx %x\n",a0,a1, (uptr)heap_addr-(uptr)psxM, size); pc0 = ra; } @@ -1008,7 +1008,7 @@ _start: #ifdef PSXBIOS_LOG PSXBIOS_LOG("psxBios_%s: %s\n", biosA0n[0x3f], tmp); #else - SysPrintf(tmp); + SysPrintf("%s", tmp); #endif pc0 = ra; @@ -1841,7 +1841,7 @@ void psxBios_puts() { // 3e/3f #ifdef PSXBIOS_LOG PSXBIOS_LOG("psxBios_%s: %s\n", biosB0n[0x3f], Ra0); #else - SysPrintf(Ra0); + SysPrintf("%s", Ra0); #endif pc0 = ra; } diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c index 9d1d0529..cbb861f6 100755 --- a/libpcsxcore/psxhle.c +++ b/libpcsxcore/psxhle.c @@ -57,7 +57,7 @@ static void hleBootstrap() { // 0xbfc00000 SysPrintf("hleBootstrap\n"); CheckCdrom(); LoadCdrom(); - SysPrintf("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp); + SysPrintf("CdromLabel: \"%s\": PC = %8.8x (SP = %8.8x)\n", CdromLabel, (unsigned int)psxRegs.pc, (unsigned int)psxRegs.GPR.n.sp); } typedef struct { diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 194fd06d..285eaf67 100755 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -75,7 +75,7 @@ int psxMemInit() { if (psxMemRLUT == NULL || psxMemWLUT == NULL || psxM == NULL || psxP == NULL || psxH == NULL) { - SysMessage(_("Error allocating memory!")); + SysMessage("%s", _("Error allocating memory!")); return -1; } diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c index 83d4fae6..7dd56327 100755 --- a/libpcsxcore/sio.c +++ b/libpcsxcore/sio.c @@ -840,7 +840,7 @@ unsigned short sioReadBaud16() { void netError() { ClosePlugins(); - SysMessage(_("Connection closed!\n")); + SysMessage("%s", _("Connection closed!\n")); CdromId[0] = '\0'; CdromLabel[0] = '\0'; |
