Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Debugger: replace prefix 'str' with 's' (PR #1082)

Browse Source
This commit is contained in:
Kelvin Lee
2022-04-07 05:36:24 +10:00
committed by GitHub
parent 5b50d784d7
commit 6e003fd49f
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Debugger/Debugger_Symbols.cpp
+6 -6
View File
@@ -125,13 +125,13 @@ Update_t _PrintSymbolInvalidTable()
//===========================================================================
std::string const& GetSymbol (WORD nAddress, int nBytes, std::string& strAddressBuf)
std::string const& GetSymbol (WORD nAddress, int nBytes, std::string& sAddressBuf)
{
std::string const* pSymbol = FindSymbolFromAddress( nAddress );
if (pSymbol)
return *pSymbol;
return strAddressBuf = FormatAddress( nAddress, nBytes );
return sAddressBuf = FormatAddress( nAddress, nBytes );
}
//===========================================================================
@@ -564,8 +564,8 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
if (pPathFileName.empty())
return nSymbolsLoaded;
std::string strFormat1 = StrFormat( "%%x %%%ds", MAX_SYMBOLS_LEN ); // i.e. "%x %13s"
std::string strFormat2 = StrFormat( "%%%ds %%x", MAX_SYMBOLS_LEN ); // i.e. "%13s %x"
std::string sFormat1 = StrFormat( "%%x %%%ds", MAX_SYMBOLS_LEN ); // i.e. "%x %13s"
std::string sFormat2 = StrFormat( "%%%ds %%x", MAX_SYMBOLS_LEN ); // i.e. "%13s %x"
FILE *hFile = fopen( pPathFileName.c_str(), "rt" );
@@ -604,7 +604,7 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
if (strstr(szLine, "$") == NULL)
{
sscanf(szLine, strFormat1.c_str(), &nAddress, sName);
sscanf(szLine, sFormat1.c_str(), &nAddress, sName);
}
else
{
@@ -623,7 +623,7 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
memset(&szLine[MAX_SYMBOLS_LEN], ' ', nLen - MAX_SYMBOLS_LEN); // sscanf fails for nAddress if string too long
}
}
sscanf(szLine, strFormat2.c_str(), sName, &nAddress);
sscanf(szLine, sFormat2.c_str(), sName, &nAddress);
}
// SymbolOffset