name some data symbols

src/nw4r/db/db_console.cpp

@@ -9,7 +9,7 @@ namespace db {
 
 static ConsoleHandle sConsoleList;
 static OSMutex sMutex;
-static u8 buf[0x400];
+static u8 sStrBuf[0x400];
 bool sInited;
 
 static ConsoleHandle FindInsertionPosition_(u16 priority) {
@@ -128,7 +128,6 @@ ConsoleHandle Console_Destroy(ConsoleHandle console) {
     return console;
 }
 
-
 static u8 *GetTextPtr_(ConsoleHandle console, u16 line, u16 xPos) {
     return &console->textBuf[(console->width + 1) * line + xPos];
 }
@@ -152,15 +151,13 @@ static u16 GetActiveLines_(ConsoleHandle console) {
 
 static void DoDrawString_(ConsoleHandle console, u32 printLine, const u8 *str, nw4r::ut::TextWriterBase<char> *writer) {
     if (writer != nullptr) {
-            writer->Printf("%s\n", str);
-        } else {
-            s32 height = console->viewPosY + printLine * 10;
-            db::DirectPrint_DrawString(console->viewPosX, height, false, "%s\n",
-                    str);
-        }
+        writer->Printf("%s\n", str);
+    } else {
+        s32 height = console->viewPosY + printLine * 10;
+        db::DirectPrint_DrawString(console->viewPosX, height, false, "%s\n", str);
+    }
 }
 
-
 static void DoDrawConsole_(ConsoleHandle console, nw4r::ut::TextWriterBase<char> *writer) {
     // I guess we don't care if locking the mutex fails??
     TryLockMutex_(&sMutex);
@@ -177,8 +174,7 @@ static void DoDrawConsole_(ConsoleHandle console, nw4r::ut::TextWriterBase<char>
     }
 
     line = console->ringTop + viewOffset;
-    if ( line >= console->height )
-    {
+    if (line >= console->height) {
         line -= console->height;
     }
 
@@ -215,7 +211,6 @@ void Console_DrawDirect(ConsoleHandle console) {
     }
 }
 
-
 static void TerminateLine_(ConsoleHandle console) {
     *GetTextPtr_(console, console->printTop, console->printXPos) = '\0';
 }
@@ -346,8 +341,8 @@ static void Console_PrintString_(ConsoleOutputType type, ConsoleHandle console,
 
 void Console_VFPrintf(ConsoleOutputType type, ConsoleHandle console, const char *format, va_list vlist) {
     if (TryLockMutex_(&sMutex)) {
-        vsnprintf((char *)buf, sizeof(buf), format, vlist);
-        Console_PrintString_(type, console, buf);
+        vsnprintf((char *)sStrBuf, sizeof(sStrBuf), format, vlist);
+        Console_PrintString_(type, console, sStrBuf);
 
         UnlockMutex_(&sMutex);
     }
@@ -357,9 +352,9 @@ void Console_Printf(ConsoleHandle console, const char *format, ...) {
     va_start(args, format);
 
     if (TryLockMutex_(&sMutex)) {
-        vsnprintf((char *)buf, sizeof(buf), format, args);
-        OSReport("%s", buf);
-        PrintToBuffer_(console, buf);
+        vsnprintf((char *)sStrBuf, sizeof(sStrBuf), format, args);
+        OSReport("%s", sStrBuf);
+        PrintToBuffer_(console, sStrBuf);
 
         UnlockMutex_(&sMutex);
     }

src/nw4r/db/db_exception.cpp

@@ -49,8 +49,6 @@ const char *CPU_EXP_NAME[] = {
         "FLOATING POINT",
 };
 
-
-
 void *RunThread_(void *);
 // TODO u8 vs u16
 void ErrorHandler_(u16, OSContext *, u32, u32);
@@ -146,8 +144,6 @@ static void DrawConsoleEndless_(ConsoleHandle console) {
     }
 }
 
-
-
 static void DumpException_(const ExceptionCallbackParam *param) {
     u16 error = param->error;
     OSContext *ctx = param->ctx;
@@ -462,14 +458,12 @@ void Exception_SetUserCallback(bool (*callback)(detail::ConsoleHead *, void *),
     sException.exceptionCallbackArgs = args;
 }
 
-
 u16 Exception_SetDisplayInfo(u16 newInfo) {
     u16 old = sException.exceptionDisplayInfo;
     sException.exceptionDisplayInfo = newInfo;
     return old;
 }
 
-
 static void WaitTime_(s32 time) {
     s64 t1 = OSGetTime();
     s64 t2;

src/nw4r/db/db_mapFile.cpp

@@ -10,11 +10,11 @@ static u32 sFileLength;
 static MapFile *sMapFileList = nullptr;
 static u8 (*GetCharPtr_)(const u8 *) = nullptr;
 
-static u8 dvdReadBuf[512] ALIGN(32);
+static u8 sMapBuf[512] ALIGN(32);
 static DVDFileInfo sFileInfo;
 
 static s32 sMapBufMaxSize = 0x200;
-static u8 *sMapBuf = dvdReadBuf;
+static u8 *sDvdBuf = sMapBuf;
 static s32 sMapBufOffset = -1;
 
 static void MapFile_Append_(MapFile *file) {
@@ -86,7 +86,7 @@ static u8 GetCharOnDvd_(const u8 *buf) {
             address = ROUND_UP(sFileLength - sMapBufOffset, 32);
         }
         BOOL enabled = OSEnableInterrupts();
-        BOOL read = DVDReadAsyncPrio(&sFileInfo, sMapBuf, address, sMapBufOffset, nullptr, 2);
+        BOOL read = DVDReadAsyncPrio(&sFileInfo, sDvdBuf, address, sMapBufOffset, nullptr, 2);
         while (DVDGetCommandBlockStatus(&sFileInfo.block)) {}
 
         OSRestoreInterrupts(enabled);
@@ -94,7 +94,7 @@ static u8 GetCharOnDvd_(const u8 *buf) {
             return 0;
         }
     }
-    return *(sMapBuf + offset);
+    return *(sDvdBuf + offset);
 }
 
 static u8 *SearchNextLine_(u8 *buf, s32 lines) {