From 9e9d6fa52c058a164d5d92fd08d79618f64397a2 Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sun, 14 Apr 2013 18:33:27 +0200
Subject: [PATCH] clean up return statements a bit more

---
 code/botlib/be_ai_move.c     | 2 --
 code/qcommon/common.c        | 3 ++-
 code/renderergl1/tr_shader.c | 8 ++------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/code/botlib/be_ai_move.c b/code/botlib/be_ai_move.c
index a9e64d5d..0c4de348 100644
--- a/code/botlib/be_ai_move.c
+++ b/code/botlib/be_ai_move.c
@@ -3455,8 +3455,6 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
 	if (result->blocked) ms->reachability_time -= 10 * ms->thinktime;
 	//copy the last origin
 	VectorCopy(ms->origin, ms->lastorigin);
-	//return the movement result
-	return;
 } //end of the function BotMoveToGoal
 //===========================================================================
 //
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 9d048a3f..3c8c25d0 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2539,8 +2539,9 @@ static void Com_WriteCDKey( const char *filename, const char *ikey ) {
 out:
 #ifndef _WIN32
 	umask(savedumask);
+#else
+	;
 #endif
-	return;
 }
 #endif
 
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index a3963c60..aa88e50b 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -1668,7 +1668,7 @@ static void ComputeStageIteratorFunc( void )
 	if ( shader.isSky )
 	{
 		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		goto done;
+		return;
 	}
 
 	if ( r_ignoreFastPath->integer )
@@ -1694,7 +1694,7 @@ static void ComputeStageIteratorFunc( void )
 							if ( !shader.numDeforms )
 							{
 								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTexture;
-								goto done;
+								return;
 							}
 						}
 					}
@@ -1720,16 +1720,12 @@ static void ComputeStageIteratorFunc( void )
 						if ( shader.multitextureEnv )
 						{
 							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitexture;
-							goto done;
 						}
 					}
 				}
 			}
 		}
 	}
-
-done:
-	return;
 }
 
 typedef struct {