actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify, cleanup

Browse Source 
"strlen" -> unescape()
This commit is contained in:
Glenn Maynard
2004-07-22 19:25:17 +00:00
parent 181b6b5bc8
commit 2c44a202c5
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/XmlFile.cpp
+10 -11
View File
@@ -72,23 +72,22 @@ char* _tcsechr( const char* psz, int ch, int escape )
// Coder Date Desc // Coder Date Desc
// bro 2002-10-29 // bro 2002-10-29
//======================================================== //========================================================
int _tcselen( int escape, const char *srt, const char *end ) int _tcselen( int escape, const char *start, const char *end )
{ {
int len = 0; int len = 0;
const char *pch = srt; if( end == NULL )
if( end==NULL )
end = (char*) sizeof(long); end = (char*) sizeof(long);
const char *prev_escape = NULL; const char *prev_escape = NULL;
while( pch && *pch && pch<end ) while( start && *start && start<end )
{ {
if( *pch == escape && prev_escape == NULL ) if( *start == escape && prev_escape == NULL )
prev_escape = pch; prev_escape = start;
else else
{ {
prev_escape = NULL; prev_escape = NULL;
len++; len++;
} }
pch++; ++start;
} }
return len; return len;
} }
@@ -102,11 +101,11 @@ int _tcselen( int escape, const char *srt, const char *end )
// Coder Date Desc // Coder Date Desc
// bro 2002-10-29 // bro 2002-10-29
//======================================================== //========================================================
void strlen( char* psz, int escape, char* srt, char* end = NULL ) void unescape( char *psz, int escape, char* srt, char* end = NULL )
{ {
char* pch = srt; const char* pch = srt;
if( end==NULL ) end = (char*)sizeof(long); if( end==NULL ) end = (char*)sizeof(long);
char* prev_escape = NULL; const char* prev_escape = NULL;
while( pch && *pch && pch<end ) while( pch && *pch && pch<end )
{ {
if( *pch == escape && prev_escape == NULL ) if( *pch == escape && prev_escape == NULL )
@@ -175,7 +174,7 @@ void _SetString( char* psz, char* end, CString* ps, bool trim = false, int escap
len = _tcselen( escape, psz, end ); len = _tcselen( escape, psz, end );
// char* pss = ps->GetBufferSetLength( len ); // char* pss = ps->GetBufferSetLength( len );
char* szTemp = new char[len]; char* szTemp = new char[len];
strlen( szTemp, escape, psz, end ); unescape( szTemp, escape, psz, end );
*ps = szTemp; *ps = szTemp;
delete [] szTemp; delete [] szTemp;
} }