From 02111e49610dfadae47c79eb1cb07bf935f2d944 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 9 Nov 2019 21:22:06 +0100 Subject: [PATCH] Fix clang-tidy and lint travis checks --- src/client/client.cpp | 2 +- util/travis/clang-format-whitelist.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index 36d4f8df9..5d4793c8a 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1913,7 +1913,7 @@ const std::string* Client::getModFile(std::string filename) if (pos == std::string::npos) return nullptr; pos++; - auto pos2 = filename.find_first_not_of("/", pos); + auto pos2 = filename.find_first_not_of('/', pos); if (pos2 > pos) filename.erase(pos, pos2 - pos); diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index 466ffd789..30d1e9e1c 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -349,6 +349,7 @@ src/script/cpp_api/s_server.h src/script/lua_api/l_areastore.cpp src/script/lua_api/l_base.cpp src/script/lua_api/l_base.h +src/script/lua_api/l_client.cpp src/script/lua_api/l_craft.cpp src/script/lua_api/l_craft.h src/script/lua_api/l_env.cpp