Insert a space between string literals and macros.

Fixes compiler warning:
    warning: invalid suffix on literal; C++11 requires
    a space between literal and string macro [-Wliteral-suffix]

diff --git a/source/kernel/Swi.cpp b/source/kernel/Swi.cpp
index 70ce7a8eb06f0c01a19530ecd9699cc79a41f69a..654d89e5792c315b3119769fa36ba403c8d83132 100644 (file)
--- a/source/kernel/Swi.cpp
+++ b/source/kernel/Swi.cpp
@@ -617,7 +617,7 @@ void ProcessSwi(u8 swi, u32 Reg[15], KThread * currentThread)
         {
             Reg[0] = SVCERROR_INVALID_HANDLE;
 #ifdef SWILOG
-            LOG("Process %s thread %u WaitSynchronization1 (%08x %"PRIx64" | % 08x % 08x)", currentThread->m_owner->GetName(), currentThread->m_thread_id, handle, timeout, Reg[0], Reg[1]);
+            LOG("Process %s thread %u WaitSynchronization1 (%08x %" PRIx64 " | % 08x % 08x)", currentThread->m_owner->GetName(), currentThread->m_thread_id, handle, timeout, Reg[0], Reg[1]);
 #endif    
             return;
         }
@@ -626,7 +626,7 @@ void ProcessSwi(u8 swi, u32 Reg[15], KThread * currentThread)
         list->AddItem(th);
         currentThread->SyncStall(list, true);
 #ifdef SWILOG
-        LOG("Process %s thread %u WaitSynchronization1 (%08x %"PRIx64") stub", currentThread->m_owner->GetName(), currentThread->m_thread_id, handle, timeout);
+        LOG("Process %s thread %u WaitSynchronization1 (%08x %" PRIx64 ") stub", currentThread->m_owner->GetName(), currentThread->m_thread_id, handle, timeout);
 #endif    
         return;
     }
@@ -1850,7 +1850,7 @@ void ProcessSwi(u8 swi, u32 Reg[15], KThread * currentThread)
                 return;
             }
 #ifdef SWILOG
-            LOG("%08x -> %"PRIx64, data, value);
+            LOG("%08x -> %" PRIx64, data, value);
 #endif
             lim->SetMaxValue(data, value);
 

diff --git a/source/process9/fs.cpp b/source/process9/fs.cpp
index 612804c4f8df3c47170f5eeede98de5f7e1c7ff5..6f02942c7261717cb16fb651ce5e158d166b1b57 100644 (file)
--- a/source/process9/fs.cpp
+++ b/source/process9/fs.cpp
@@ -35,7 +35,7 @@ void P9FS::Command(u32 data[], u32 numb)
 #ifdef LOGFS
                char tmp[256];
                LOG("FS OpenFile");
-               LOG("   archive_handle=%"PRIx64, handle);
+               LOG("   archive_handle=%" PRIx64, handle);
                LOG("   flags = %s", P9File::FlagsToString(flags, tmp));
 #endif
 
@@ -82,7 +82,7 @@ void P9FS::Command(u32 data[], u32 numb)
                }
 
 #ifdef LOGFS
-               LOG("   p9file_handle=%"PRIx64, p9file_handle);
+               LOG("   p9file_handle=%" PRIx64, p9file_handle);
 #endif
 
                resdata[0] = 0x000100C1;
@@ -103,7 +103,7 @@ void P9FS::Command(u32 data[], u32 numb)
 
 #ifdef LOGFS
                LOG("FS DeleteFile");
-               LOG("   archive_handle=%"PRIx64, handle);
+               LOG("   archive_handle=%" PRIx64, handle);
 #endif
 
                resdata[0] = 0x00020142;
@@ -152,8 +152,8 @@ void P9FS::Command(u32 data[], u32 numb)
 
 #ifdef LOGFS
                LOG("FS ReadFile %08x %08x %08x", size, desc_read, ptr_read);
-               LOG("   file_handle=%"PRIx64, handle);
-               LOG("   file_offset=%"PRIx64, file_offset);
+               LOG("   file_handle=%" PRIx64, handle);
+               LOG("   file_offset=%" PRIx64, file_offset);
 #endif
                resdata[0] = 0x00090142;
                resdata[1] = 0xFFFFFFFF; //todo get the correct error
@@ -196,7 +196,7 @@ void P9FS::Command(u32 data[], u32 numb)
                u32 ptr_hashtable = data[5];
 #ifdef LOGFS
                LOG("FS CalculateFileHashSHA256");
-               LOG("   file_handle=%"PRIx64, handle);
+               LOG("   file_handle=%" PRIx64, handle);
                LOG("   size=%08X", size_hashtable);
                LOG("   ptr=%08X", ptr_hashtable);
 #endif
@@ -233,7 +233,7 @@ void P9FS::Command(u32 data[], u32 numb)
 #ifdef LOGFS
                LOG("FS WriteFile %08x %08x %08x", size, desc_write, ptr_write);
                LOG("   file_handle=%08X", handle);
-               LOG("   file_offset=%"PRIx64, file_offset);
+               LOG("   file_offset=%" PRIx64, file_offset);
 #endif
                resdata[0] = 0x000B0182;
                resdata[1] = 0xFFFFFFFF; //todo get the correct error
@@ -280,7 +280,7 @@ void P9FS::Command(u32 data[], u32 numb)
                u32 out_ptr = data[8];
 #ifdef LOGFS
                LOG("FS CalcSavegameMAC");
-               LOG("   file_handle=%"PRIx64, handle);
+               LOG("   file_handle=%" PRIx64, handle);
                LOG("   in  size=%08X, ptr=%08X", in_size, in_ptr);
                LOG("   out size=%08X, ptr=%08X", out_size, out_ptr);
 #endif
@@ -307,7 +307,7 @@ void P9FS::Command(u32 data[], u32 numb)
                resdata[1] = 0xFFFFFFFF; //todo get the correct error
                u64 handle = (data[1] >> 0) | ((u64)(data[2]) << 32);
 #ifdef LOGFS
-               LOG("FS GetFileSize=%"PRIx64, handle);
+               LOG("FS GetFileSize=%" PRIx64, handle);
 #endif
                auto a = m_fopen.list;
                while (a)
@@ -334,8 +334,8 @@ void P9FS::Command(u32 data[], u32 numb)
                u64 handle = (data[3] >> 0) | ((u64)(data[4]) << 32);
 #ifdef LOGFS
                LOG("FS SetFileSize");
-               LOG("   file_handle=%"PRIx64, handle);
-               LOG("   size=%"PRIx64, size);
+               LOG("   file_handle=%" PRIx64, handle);
+               LOG("   size=%" PRIx64, size);
 #endif
                auto a = m_fopen.list;
                while (a)
@@ -356,7 +356,7 @@ void P9FS::Command(u32 data[], u32 numb)
                resdata[0] = 0x000F0040;
                resdata[1] = 0xFFFFFFFF; //todo get the correct error
                u64 handle = (data[1] >> 0) | ((u64)(data[2]) << 32);
-               LOG("CloseFile=%"PRIx64, handle);
+               LOG("CloseFile=%" PRIx64, handle);
                auto a = m_fopen.list;
                while (a)
                {
@@ -399,7 +399,7 @@ void P9FS::Command(u32 data[], u32 numb)
 
 #ifdef LOGFS
         LOG("FS OpenArchive stub %08x %08x %08x %08x", data[1], data[2], data[3], data[4]);
-        LOG("   archive_handle=%"PRIx64, a->id);
+        LOG("   archive_handle=%" PRIx64, a->id);
 #endif
                a->Archobj = NULL;
                resdata[1] = 0;
@@ -472,7 +472,7 @@ void P9FS::Command(u32 data[], u32 numb)
 
 #ifdef LOGFS
                LOG("FS CloseArchive - stubbed");
-               LOG("   archive_handle=%"PRIx64, handle);
+               LOG("   archive_handle=%" PRIx64, handle);
 #endif
 
                auto a = m_open.list;
@@ -500,7 +500,7 @@ void P9FS::Command(u32 data[], u32 numb)
                u64 handle = (data[1] >> 0) | ((u64)(data[2]) << 32);
 #ifdef LOGFS
                LOG("FS Unk17 - stubbed");
-               LOG("   archive_handle=%"PRIx64, handle);
+               LOG("   archive_handle=%" PRIx64, handle);
 #endif
                resdata[0] = 0x00170080;
                resdata[1] = 0;
@@ -562,8 +562,8 @@ void P9FS::Command(u32 data[], u32 numb)
 
 #ifdef LOGFS
                LOG("FS ReadFileWrapper (SHA-256 not implemented) %08x %08x %08x", size, alinement, size_hashtable);
-               LOG("   file_handle=%"PRIx64, handle);
-               LOG("   file_offset=%"PRIx64, file_offset);
+               LOG("   file_handle=%" PRIx64, handle);
+               LOG("   file_offset=%" PRIx64, file_offset);
                LOG("   pointer=%08x", ptr_read);
                LOG("   modulename=%s", m_owner->m_kernel->m_IPCFIFOAdresses[(desc_read >> 4) & 0xF]->m_process->GetName());
 #endif
@@ -616,7 +616,7 @@ void P9FS::Command(u32 data[], u32 numb)
 #ifdef LOGFS
                LOG("FS WriteFileWrapper %08x %08x %08x %08x %08x", size, desc_write, ptr_write, unk, size_hashtable);
                LOG("   file_handle=%08X", handle);
-               LOG("   file_offset=%"PRIx64, file_offset);
+               LOG("   file_offset=%" PRIx64, file_offset);
 #endif
                resdata[0] = 0x000B0182;
                resdata[1] = 0xFFFFFFFF; //todo get the correct error

diff --git a/source/process9/pm.cpp b/source/process9/pm.cpp
index ebdb3a2413f9b84710aea2008e59ff06f173cbe0..f58a050dedfdc46fcf38b620fa748e85b9d9ffc7 100644 (file)
--- a/source/process9/pm.cpp
+++ b/source/process9/pm.cpp
@@ -37,7 +37,7 @@ void P9PM::Command(u32 data[],u32 numb)
         }
         if (a)
         {
-            LOG("pm getexheader handle=%"PRIx64", titleid=%"PRIx64, handle, a->data->title);
+            LOG("pm getexheader handle=%" PRIx64 ", titleid=%" PRIx64, handle, a->data->title);
             KMemoryMap* map = m_owner->m_kernel->m_IPCFIFOAdresses[(data[3] >> 4) &0xF];
             resdata[1] = 0xE0000000;
             FILE * fd = openapp(a->data->title >> 32, (u32)a->data->title);
@@ -78,7 +78,7 @@ void P9PM::Command(u32 data[],u32 numb)
         else
         {
 #ifdef LOGPM
-            LOG("pm getexheader handle=%"PRIx64, handle);
+            LOG("pm getexheader handle=%" PRIx64, handle);
 #endif
             resdata[1] = 0xE0000000; //todo correct error
         }