Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: Enforce braces around if blocks and loops

Browse source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde 2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download patch file Download diff file Expand all files Collapse all files

50
drivers/unix/os_unix.cpp
View file

@ -95,8 +95,9 @@ void OS_Unix::debug_break() {
};
static void handle_interrupt(int sig) {
if (!EngineDebugger::is_active())
if (!EngineDebugger::is_active()) {
return;
}
EngineDebugger::get_script_debugger()->set_depth(-1);
EngineDebugger::get_script_debugger()->set_lines_left(1);
@ -181,10 +182,11 @@ uint64_t OS_Unix::get_system_time_msecs() const {
OS::Date OS_Unix::get_date(bool utc) const {
time_t t = time(nullptr);
struct tm *lt;
if (utc)
if (utc) {
lt = gmtime(&t);
else
} else {
lt = localtime(&t);
}
Date ret;
ret.year = 1900 + lt->tm_year;
// Index starting at 1 to match OS_Unix::get_date
@ -201,10 +203,11 @@ OS::Date OS_Unix::get_date(bool utc) const {
OS::Time OS_Unix::get_time(bool utc) const {
time_t t = time(nullptr);
struct tm *lt;
if (utc)
if (utc) {
lt = gmtime(&t);
else
} else {
lt = localtime(&t);
}
Time ret;
ret.hour = lt->tm_hour;
ret.min = lt->tm_min;
@ -231,10 +234,11 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_info() const {
// convert from ISO 8601 (1 minute=1, 1 hour=100) to minutes
int hour = (int)bias / 100;
int minutes = bias % 100;
if (bias < 0)
if (bias < 0) {
ret.bias = hour * 60 - minutes;
else
} else {
ret.bias = hour * 60 + minutes;
}
return ret;
}
@ -295,8 +299,9 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
}
}
int rv = pclose(f);
if (r_exitcode)
if (r_exitcode) {
*r_exitcode = WEXITSTATUS(rv);
}
return OK;
}
@ -315,12 +320,14 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
Vector<CharString> cs;
cs.push_back(p_path.utf8());
for (int i = 0; i < p_arguments.size(); i++)
for (int i = 0; i < p_arguments.size(); i++) {
cs.push_back(p_arguments[i].utf8());
}
Vector<char *> args;
for (int i = 0; i < cs.size(); i++)
for (int i = 0; i < cs.size(); i++) {
args.push_back((char *)cs[i].get_data());
}
args.push_back(0);
execvp(p_path.utf8().get_data(), &args[0]);
@ -332,12 +339,14 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
if (p_blocking) {
int status;
waitpid(pid, &status, 0);
if (r_exitcode)
if (r_exitcode) {
*r_exitcode = WEXITSTATUS(status);
}
} else {
if (r_child_id)
if (r_child_id) {
*r_child_id = pid;
}
}
return OK;
@ -363,13 +372,15 @@ bool OS_Unix::has_environment(const String &p_var) const {
}
String OS_Unix::get_locale() const {
if (!has_environment("LANG"))
if (!has_environment("LANG")) {
return "en";
}
String locale = get_environment("LANG");
int tp = locale.find(".");
if (tp != -1)
if (tp != -1) {
locale = locale.substr(0, tp);
}
return locale;
}
@ -420,15 +431,17 @@ Error OS_Unix::get_dynamic_library_symbol_handle(void *p_library_handle, const S
}
Error OS_Unix::set_cwd(const String &p_cwd) {
if (chdir(p_cwd.utf8().get_data()) != 0)
if (chdir(p_cwd.utf8().get_data()) != 0) {
return ERR_CANT_OPEN;
}
return OK;
}
String OS_Unix::get_environment(const String &p_var) const {
if (getenv(p_var.utf8().get_data()))
if (getenv(p_var.utf8().get_data())) {
return getenv(p_var.utf8().get_data());
}
return "";
}
@ -516,10 +529,11 @@ void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, i
}
const char *err_details;
if (p_rationale && p_rationale[0])
if (p_rationale && p_rationale[0]) {
err_details = p_rationale;
else
} else {
err_details = p_code;
}
// Disable color codes if stdout is not a TTY.
// This prevents Godot from writing ANSI escape codes when redirecting