szError -> RString

This commit is contained in:
Glenn Maynard
2006-02-14 05:53:57 +00:00
parent 2ab27b5478
commit fc2028b997
@@ -46,7 +46,7 @@ namespace VDDebugInfo
const unsigned long (*pSegments)[2]; const unsigned long (*pSegments)[2];
int nSegments; int nSegments;
char sFilename[1024]; char sFilename[1024];
char szError[1024]; RString sError;
}; };
static void GetVDIPath( char *buf, int bufsiz ) static void GetVDIPath( char *buf, int bufsiz )
@@ -69,7 +69,7 @@ namespace VDDebugInfo
static const char *header = "symbolic debug information"; static const char *header = "symbolic debug information";
if( memcmp(src, header, strlen(header)) ) if( memcmp(src, header, strlen(header)) )
{ {
strcpy( pctx->szError, "header doesn't match" ); pctx->sError = "header doesn't match";
return false; return false;
} }
@@ -104,12 +104,12 @@ namespace VDDebugInfo
pctx->pRawBlock = NULL; pctx->pRawBlock = NULL;
pctx->pRVAHeap = NULL; pctx->pRVAHeap = NULL;
GetVDIPath( pctx->sFilename, ARRAYSIZE(pctx->sFilename) ); GetVDIPath( pctx->sFilename, ARRAYSIZE(pctx->sFilename) );
pctx->szError[0] = 0; pctx->sError = RString();
HANDLE h = CreateFile( pctx->sFilename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); HANDLE h = CreateFile( pctx->sFilename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
if( h == INVALID_HANDLE_VALUE ) if( h == INVALID_HANDLE_VALUE )
{ {
strcpy( pctx->szError, "CreateFile failed" ); pctx->sError = "CreateFile failed";
return false; return false;
} }
@@ -382,7 +382,7 @@ namespace
RString ReportCallStack( const void * const *Backtrace ) RString ReportCallStack( const void * const *Backtrace )
{ {
if( !g_debugInfo.Loaded() ) if( !g_debugInfo.Loaded() )
return ssprintf( "debug resource file '%s': %s.\n", g_debugInfo.sFilename, g_debugInfo.szError ); return ssprintf( "debug resource file '%s': %s.\n", g_debugInfo.sFilename, g_debugInfo.sError.c_str() );
if( g_debugInfo.nBuildNumber != int(version_num) ) if( g_debugInfo.nBuildNumber != int(version_num) )
{ {