jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Convert strtok() to strtok_r() for improved thread safety.

Browse source
This commit is contained in:
Micke Prag 2012-06-19 14:13:18 +02:00
parent d2332cb605
commit c26efc1305
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
telldus-core/service/ProtocolIkea.cpp
View file

@ -45,14 +45,15 @@ std::string ProtocolIkea::getStringForMethod(int method, unsigned char level, Co
strcpy(tempUnits, strUnits.c_str()); strcpy(tempUnits, strUnits.c_str());
#endif #endif
char *strToken = strtok(tempUnits, ","); char *saveptr;
char *strToken = strtok_r(tempUnits, ",", &saveptr);
do { do {
int intUnit = atoi(strToken); int intUnit = atoi(strToken);
if (intUnit == 10) { if (intUnit == 10) {
intUnit = 0; intUnit = 0;
} }
intUnits = intUnits | ( 1<<(9-intUnit) ); intUnits = intUnits | ( 1<<(9-intUnit) );
} while ( (strToken = strtok(NULL, ",")) != NULL ); } while ( (strToken = strtok_r(NULL, ",", &saveptr)) != NULL );
delete[] tempUnits; delete[] tempUnits;