Refactoring: strdup also exists in MSVS

This commit is contained in:
Nicolas Le Cam 2008-12-21 17:45:05 +00:00
parent 1f141e4dc0
commit 1f68dfa57e
3 changed files with 3 additions and 15 deletions

View File

@ -32,9 +32,6 @@
#include <string.h> #include <string.h>
#endif #endif
#ifndef _MSC_VER
#define _strdup(str) strdup(str)
#endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

View File

@ -49,11 +49,7 @@ void TOKEN::setstr( const char s[] )
{ {
_str = s; _str = s;
std::free(_cstr); std::free(_cstr);
#ifndef _MSC_VER
_cstr = strdup(s); _cstr = strdup(s);
#else
_cstr = _strdup(s);
#endif
_isName = bool(_str[0]=='_' || isalpha(_str[0])); _isName = bool(_str[0]=='_' || isalpha(_str[0]));
_isNumber = bool(isdigit(_str[0]) != 0); _isNumber = bool(isdigit(_str[0]) != 0);
if( _str == "true" || _str == "false" ) if( _str == "true" || _str == "false" )

View File

@ -42,11 +42,6 @@
#include <mem.h> #include <mem.h>
#endif #endif
#ifndef _MSC_VER
#define _strdup(str) strdup(str)
#endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -117,7 +112,7 @@ void Tokenizer::Define(const char Name[], const char Value[])
if (!dec && !hex) if (!dec && !hex)
return; return;
char *strValue = _strdup(Value); char *strValue = strdup(Value);
if (!dec && hex) if (!dec && hex)
{ {
@ -128,12 +123,12 @@ void Tokenizer::Define(const char Name[], const char Value[])
std::ostringstream ostr; std::ostringstream ostr;
ostr << value; ostr << value;
free(strValue); free(strValue);
strValue = _strdup(ostr.str().c_str()); strValue = strdup(ostr.str().c_str());
} }
DefineSymbol *NewSym = new DefineSymbol; DefineSymbol *NewSym = new DefineSymbol;
memset(NewSym, 0, sizeof(DefineSymbol)); memset(NewSym, 0, sizeof(DefineSymbol));
NewSym->name = _strdup(Name); NewSym->name = strdup(Name);
NewSym->value = strValue; NewSym->value = strValue;
NewSym->next = _dsymlist; NewSym->next = _dsymlist;
_dsymlist = NewSym; _dsymlist = NewSym;