From baa94a375858e80bf9424fd895e3384edb4e114c Mon Sep 17 00:00:00 2001
From: "Wilson E. Alvarez" <wilson.e.alvarez1@gmail.com>
Date: Tue, 22 Aug 2017 13:01:57 -0400
Subject: [PATCH] Removed unnecessary returns and break statements

---
 main/tests/test_shader_lang.cpp                    | 2 --
 modules/gdscript/gd_function.h                     | 3 ++-
 modules/gdscript/gd_script.cpp                     | 3 ++-
 modules/visual_script/visual_script_expression.cpp | 1 -
 platform/android/godot_android.cpp                 | 1 -
 scene/gui/control.cpp                              | 2 --
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index dc581a71e2..f9516dad99 100644
--- a/main/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
@@ -56,8 +56,6 @@ static String _mktab(int p_level) {
 static String _typestr(SL::DataType p_type) {
 
 	return ShaderLanguage::get_datatype_name(p_type);
-
-	return "";
 }
 
 static String _prestr(SL::DataPrecision p_pres) {
diff --git a/modules/gdscript/gd_function.h b/modules/gdscript/gd_function.h
index 6d20b19777..661de0acce 100644
--- a/modules/gdscript/gd_function.h
+++ b/modules/gdscript/gd_function.h
@@ -210,8 +210,9 @@ public:
 #ifdef TOOLS_ENABLED
 		ERR_FAIL_INDEX_V(p_idx, arg_names.size(), StringName());
 		return arg_names[p_idx];
-#endif
+#else
 		return StringName();
+#endif
 	}
 	Variant get_default_argument(int p_idx) const {
 		ERR_FAIL_INDEX_V(p_idx, default_arguments.size(), Variant());
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 2d06c0f5d2..23201dc1b0 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -559,8 +559,9 @@ bool GDScript::_update_exports() {
 
 	return changed;
 
-#endif
+#else
 	return false;
+#endif
 }
 
 void GDScript::update_exports() {
diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp
index 78b70934c0..25c2ebd6d2 100644
--- a/modules/visual_script/visual_script_expression.cpp
+++ b/modules/visual_script/visual_script_expression.cpp
@@ -585,7 +585,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 								r_token.type = TK_BASIC_TYPE;
 								r_token.value = i;
 								return OK;
-								break;
 							}
 						}
 
diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp
index 5933b83d06..2dd2c0532a 100644
--- a/platform/android/godot_android.cpp
+++ b/platform/android/godot_android.cpp
@@ -833,7 +833,6 @@ void android_main(struct android_app *app) {
 			if (engine.requested_quit) {
 				engine_term_display(&engine);
 				exit(0);
-				return;
 			}
 
 			//     LOGI("end\n");
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 6a3ef66e0a..36fc9a6b3a 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1839,8 +1839,6 @@ Control *Control::find_prev_valid_focus() const {
 	}
 
 	return NULL;
-
-	return NULL;
 }
 
 Control::FocusMode Control::get_focus_mode() const {