From 2511c439727226f64def8b15b38d084db187cf55 Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Sun, 5 Jul 2020 19:19:36 +0200
Subject: Mono/C#: Fix several clang-tidy warnings and cleanup

---
 modules/mono/utils/path_utils.cpp   | 46 ++++++++++---------------------------
 modules/mono/utils/path_utils.h     |  2 --
 modules/mono/utils/string_utils.cpp | 12 ++++++----
 3 files changed, 20 insertions(+), 40 deletions(-)

(limited to 'modules/mono/utils')

diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp
index 973375a471..ccfaf5aba7 100644
--- a/modules/mono/utils/path_utils.cpp
+++ b/modules/mono/utils/path_utils.cpp
@@ -50,34 +50,6 @@
 
 namespace path {
 
-String find_executable(const String &p_name) {
-#ifdef WINDOWS_ENABLED
-	Vector<String> exts = OS::get_singleton()->get_environment("PATHEXT").split(ENV_PATH_SEP, false);
-#endif
-	Vector<String> env_path = OS::get_singleton()->get_environment("PATH").split(ENV_PATH_SEP, false);
-
-	if (env_path.empty())
-		return String();
-
-	for (int i = 0; i < env_path.size(); i++) {
-		String p = path::join(env_path[i], p_name);
-
-#ifdef WINDOWS_ENABLED
-		for (int j = 0; j < exts.size(); j++) {
-			String p2 = p + exts[j].to_lower(); // lowercase to reduce risk of case mismatch warning
-
-			if (FileAccess::exists(p2))
-				return p2;
-		}
-#else
-		if (FileAccess::exists(p))
-			return p;
-#endif
-	}
-
-	return String();
-}
-
 String cwd() {
 #ifdef WINDOWS_ENABLED
 	const DWORD expected_size = ::GetCurrentDirectoryW(0, nullptr);
@@ -90,12 +62,14 @@ String cwd() {
 	return buffer.simplify_path();
 #else
 	char buffer[PATH_MAX];
-	if (::getcwd(buffer, sizeof(buffer)) == nullptr)
+	if (::getcwd(buffer, sizeof(buffer)) == nullptr) {
 		return ".";
+	}
 
 	String result;
-	if (result.parse_utf8(buffer))
+	if (result.parse_utf8(buffer)) {
 		return ".";
+	}
 
 	return result.simplify_path();
 #endif
@@ -135,23 +109,26 @@ String realpath(const String &p_path) {
 #elif UNIX_ENABLED
 	char *resolved_path = ::realpath(p_path.utf8().get_data(), nullptr);
 
-	if (!resolved_path)
+	if (!resolved_path) {
 		return p_path;
+	}
 
 	String result;
 	bool parse_ok = result.parse_utf8(resolved_path);
 	::free(resolved_path);
 
-	if (parse_ok)
+	if (parse_ok) {
 		return p_path;
+	}
 
 	return result.simplify_path();
 #endif
 }
 
 String join(const String &p_a, const String &p_b) {
-	if (p_a.empty())
+	if (p_a.empty()) {
 		return p_b;
+	}
 
 	const CharType a_last = p_a[p_a.length() - 1];
 	if ((a_last == '/' || a_last == '\\') ||
@@ -178,8 +155,9 @@ String relative_to_impl(const String &p_path, const String &p_relative_to) {
 	} else {
 		String base_dir = p_relative_to.get_base_dir();
 
-		if (base_dir.length() <= 2 && (base_dir.empty() || base_dir.ends_with(":")))
+		if (base_dir.length() <= 2 && (base_dir.empty() || base_dir.ends_with(":"))) {
 			return p_path;
+		}
 
 		return String("..").plus_file(relative_to_impl(p_path, base_dir));
 	}
diff --git a/modules/mono/utils/path_utils.h b/modules/mono/utils/path_utils.h
index 9965f58b0a..bcd8af8bb9 100644
--- a/modules/mono/utils/path_utils.h
+++ b/modules/mono/utils/path_utils.h
@@ -40,8 +40,6 @@ String join(const String &p_a, const String &p_b);
 String join(const String &p_a, const String &p_b, const String &p_c);
 String join(const String &p_a, const String &p_b, const String &p_c, const String &p_d);
 
-String find_executable(const String &p_name);
-
 /// Returns a normalized absolute path to the current working directory
 String cwd();
 
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp
index da1b719d99..f8d9804de4 100644
--- a/modules/mono/utils/string_utils.cpp
+++ b/modules/mono/utils/string_utils.cpp
@@ -38,14 +38,16 @@
 namespace {
 
 int sfind(const String &p_text, int p_from) {
-	if (p_from < 0)
+	if (p_from < 0) {
 		return -1;
+	}
 
 	int src_len = 2;
 	int len = p_text.length();
 
-	if (len == 0)
+	if (len == 0) {
 		return -1;
+	}
 
 	const CharType *src = p_text.c_str();
 
@@ -75,8 +77,9 @@ int sfind(const String &p_text, int p_from) {
 			}
 		}
 
-		if (found)
+		if (found) {
 			return i;
+		}
 	}
 
 	return -1;
@@ -85,8 +88,9 @@ int sfind(const String &p_text, int p_from) {
 } // namespace
 
 String sformat(const String &p_text, const Variant &p1, const Variant &p2, const Variant &p3, const Variant &p4, const Variant &p5) {
-	if (p_text.length() < 2)
+	if (p_text.length() < 2) {
 		return p_text;
+	}
 
 	Array args;
 
-- 
cgit v1.2.3