add hr_ssprintf; remove a bunch of empty comments

This commit is contained in:
Glenn Maynard
2002-12-09 03:09:59 +00:00
parent e731ee03ed
commit 0984cfd15d
2 changed files with 16 additions and 20 deletions
+13 -20
View File
@@ -65,10 +65,6 @@ CString SecondsToTime( float fSecs )
return sReturn;
}
//-----------------------------------------------------------------------------
// Name: ssprintf()
// Desc:
//-----------------------------------------------------------------------------
CString ssprintf( const char *fmt, ...)
{
va_list va;
@@ -77,10 +73,6 @@ CString ssprintf( const char *fmt, ...)
}
//-----------------------------------------------------------------------------
// Name: vssprintf()
// Desc:
//-----------------------------------------------------------------------------
CString vssprintf( const char *fmt, va_list argList)
{
CString str;
@@ -88,12 +80,21 @@ CString vssprintf( const char *fmt, va_list argList)
return str;
}
#ifdef WIN32
#include "dxerr8.h"
#pragma comment(lib, "DxErr8.lib")
CString hr_ssprintf( int hr, const char *fmt, ...)
{
va_list va;
va_start(va, fmt);
CString s = vssprintf( fmt, va );
va_end(va);
return s += ssprintf( "(%s)", DXGetErrorString8(hr) );
}
#endif
//-----------------------------------------------------------------------------
// Name: join()
// Desc:
//-----------------------------------------------------------------------------
CString join( const CString &Deliminator, const CStringArray& Source)
{
if( Source.empty() )
@@ -111,10 +112,6 @@ CString join( const CString &Deliminator, const CStringArray& Source)
}
//-----------------------------------------------------------------------------
// Name: split()
// Desc:
//-----------------------------------------------------------------------------
void split( const CString &Source, const CString &Deliminator, CStringArray& AddIt, const bool bIgnoreEmpty )
{
int startpos = 0;
@@ -199,10 +196,6 @@ void splitpath( bool UsingDirsOnly, const CString &Path, CString& Drive, CString
}
}
//-----------------------------------------------------------------------------
// Name: splitpath()
// Desc:
//-----------------------------------------------------------------------------
void splitrelpath( const CString &Path, CString& Dir, CString& FName, CString& Ext )
{
/* Find the last slash or backslash. */
+3
View File
@@ -119,6 +119,9 @@ CString SecondsToTime( float fSecs );
CString ssprintf( const char *fmt, ...);
CString vssprintf( const char *fmt, va_list argList );
#ifdef WIN32
CString hr_ssprintf( int hr, const char *fmt, ...);
#endif
// Splits a Path into 4 parts (Directory, Drive, Filename, Extention). Supports UNC path names.
// param1: Whether the Supplied Path (PARAM2) contains a directory name only