Skip to content

Commit 3d54ebb

Browse files
committed
add new clang-tidy option
* readability-redundant-string-cstr
1 parent 9ca4920 commit 3d54ebb

File tree

22 files changed

+50
-49
lines changed

22 files changed

+50
-49
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Checks: >
1111
readability-container-size-empty,
1212
readability-delete-null-pointer,
1313
readability-redundant-control-flow,
14+
readability-redundant-string-cstr,
1415
1516
WarningsAsErrors: '*'
1617
HeaderFilterRegex: '/(?!external)/.*'

cocos/audio/linux/SimpleAudioEngine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void SimpleAudioEngine::stopBackgroundMusic(bool releaseData)
8484
{
8585
AudioEngine::stop(g_SimpleAudioEngineLinux->musicid);
8686
if (releaseData) {
87-
AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath.c_str());
87+
AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath);
8888
}
8989
}
9090

cocos/base/CCDataVisitor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void PrettyPrinter::visit(const __Set *p)
203203
if (i > 0) {
204204
_result += "\n";
205205
}
206-
_result += _indentStr.c_str();
206+
_result += _indentStr;
207207
PrettyPrinter v(_indentLevel);
208208
//FIXME:james (*it)->acceptVisitor(v);
209209
_result += v.getResult();

cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ Offset<NodeAction> FlatBuffersSerialize::createNodeAction(const tinyxml2::XMLEle
577577
}
578578
else if (name == "ActivedAnimationName")
579579
{
580-
currentAnimationName = value.c_str();
580+
currentAnimationName = value;
581581
}
582582

583583
attribute = attribute->Next();

cocos/network/SocketIO.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ void SIOClientImpl::send(SocketIOPacket *packet)
720720
if (_connected)
721721
{
722722
CCLOGINFO("-->SEND:%s", req.data());
723-
_ws->send(req.data());
723+
_ws->send(req);
724724
}
725725
else
726726
CCLOGINFO("Cant send the message (%s) because disconnected", req.c_str());
@@ -757,7 +757,7 @@ void SIOClientImpl::onOpen(WebSocket* /*ws*/)
757757
if (_version == SocketIOPacket::SocketIOVersion::V10x)
758758
{
759759
std::string s = "5";//That's a ping https://github.com/Automattic/engine.io-parser/blob/1b8e077b2218f4947a69f5ad18be2a512ed54e93/lib/index.js#L21
760-
_ws->send(s.data());
760+
_ws->send(s);
761761
}
762762

763763
Director::getInstance()->getScheduler()->schedule(CC_SCHEDULE_SELECTOR(SIOClientImpl::heartbeat), this, (_heartbeat * .9f), false);

cocos/platform/linux/CCDevice-linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ class BitmapDC
349349
std::string lowerCasePath = fontPath;
350350
std::transform(lowerCasePath.begin(), lowerCasePath.end(), lowerCasePath.begin(), ::tolower);
351351
if ( lowerCasePath.find(".ttf") != std::string::npos ) {
352-
fontPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(fontPath.c_str());
352+
fontPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(fontPath);
353353

354354
FILE *f = fopen(fontPath.c_str(), "r");
355355
if ( f ) {

cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ bool jsval_to_TerrainData(JSContext* cx, JS::HandleValue v, Terrain::TerrainData
239239
JS::ToNumber(cx, js_mapHeight, &mapHeight);
240240
JSB_PRECONDITION2(ok, cx, false, "Error processing arguments");
241241

242-
ret->_heightMapSrc = heightMap.c_str();
242+
ret->_heightMapSrc = heightMap;
243243
char* tmp = (char*)malloc(sizeof(char) * (alphaMap.size() + 1));
244244
strcpy(tmp, alphaMap.c_str());
245245
tmp[alphaMap.size()] = '\0';

cocos/scripting/lua-bindings/manual/CCLuaStack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ int LuaStack::luaLoadChunksFromZIP(lua_State *L)
801801
std::string filename = zip->getFirstFilename();
802802
while (filename.length()) {
803803
ssize_t bufferSize = 0;
804-
unsigned char *zbuffer = zip->getFileData(filename.c_str(), &bufferSize);
804+
unsigned char *zbuffer = zip->getFileData(filename, &bufferSize);
805805
if (bufferSize) {
806806
// remove .lua or .luac extension
807807
size_t pos = filename.find_last_of('.');

cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3779,7 +3779,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)
37793779
if (ok)
37803780
{
37813781
std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0);
3782-
__String* contentsOfFile = __String::createWithContentsOfFile(fullPathName.c_str());
3782+
__String* contentsOfFile = __String::createWithContentsOfFile(fullPathName);
37833783
if (nullptr != contentsOfFile)
37843784
{
37853785
const char* tolua_ret = contentsOfFile->getCString();

cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getScene(lua_State* tolua_S)
135135
auto iter = g_luaType.find(hashName);
136136
std::string className = "";
137137
if(iter != g_luaType.end()){
138-
className = iter->second.c_str();
138+
className = iter->second;
139139
} else {
140140
className = "cc.Scene";
141141
}

0 commit comments

Comments
 (0)