godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases 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

45
modules/websocket/wsl_server.cpp
View File

@@ -60,10 +60,11 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols) {
ERR_FAIL_COND_V_MSG(header.size() != 2, false, "Invalid header -> " + psa[i]);
String name = header[0].to_lower();
String value = header[1].strip_edges();
if (headers.has(name))
if (headers.has(name)) {
headers[name] += "," + value;
else
} else {
headers[name] = value;
}
}
#define _WSL_CHECK(NAME, VALUE) \
ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
@@ -83,44 +84,52 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols) {
String proto = protos[i].strip_edges();
// Check if we have the given protocol
for (int j = 0; j < p_protocols.size(); j++) {
if (proto != p_protocols[j])
if (proto != p_protocols[j]) {
continue;
}
protocol = proto;
break;
}
// Found a protocol
if (protocol != "")
if (protocol != "") {
break;
}
}
if (protocol == "") // Invalid protocol(s) requested
if (protocol == "") { // Invalid protocol(s) requested
return false;
} else if (p_protocols.size() > 0) // No protocol requested, but we need one
}
} else if (p_protocols.size() > 0) { // No protocol requested, but we need one
return false;
}
return true;
}
Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
if (OS::get_singleton()->get_ticks_msec() - time > WSL_SERVER_TIMEOUT)
if (OS::get_singleton()->get_ticks_msec() - time > WSL_SERVER_TIMEOUT) {
return ERR_TIMEOUT;
}
if (use_ssl) {
Ref<StreamPeerSSL> ssl = static_cast<Ref<StreamPeerSSL>>(connection);
if (ssl.is_null())
if (ssl.is_null()) {
return FAILED;
}
ssl->poll();
if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING)
if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
return ERR_BUSY;
else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED)
} else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
return FAILED;
}
}
if (!has_request) {
int read = 0;
while (true) {
ERR_FAIL_COND_V_MSG(req_pos >= WSL_MAX_HEADER_SIZE, ERR_OUT_OF_MEMORY, "Response headers too big.");
Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
if (err != OK) // Got an error
if (err != OK) { // Got an error
return FAILED;
else if (read != 1) // Busy, wait next poll
} else if (read != 1) { // Busy, wait next poll
return ERR_BUSY;
}
char *r = (char *)req_buf;
int l = req_pos;
if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
@@ -132,8 +141,9 @@ Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
s += "Upgrade: websocket\r\n";
s += "Connection: Upgrade\r\n";
s += "Sec-WebSocket-Accept: " + WSLPeer::compute_key_response(key) + "\r\n";
if (protocol != "")
if (protocol != "") {
s += "Sec-WebSocket-Protocol: " + protocol + "\r\n";
}
s += "\r\n";
response = s.utf8();
has_request = true;
@@ -150,8 +160,9 @@ Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
}
response_sent += sent;
}
if (response_sent < response.size() - 1)
if (response_sent < response.size() - 1) {
return ERR_BUSY;
}
return OK;
}
@@ -216,13 +227,15 @@ void WSLServer::poll() {
}
remove_peers.clear();
if (!_server->is_listening())
if (!_server->is_listening()) {
return;
}
while (_server->is_connection_available()) {
Ref<StreamPeerTCP> conn = _server->take_connection();
if (is_refusing_new_connections())
if (is_refusing_new_connections()) {
continue; // Conn will go out-of-scope and be closed.
}
Ref<PendingPeer> peer = memnew(PendingPeer);
if (private_key.is_valid() && ssl_cert.is_valid()) {