From 9d626b6a1249c8aeb200d939b9d79a32b34cfe42 Mon Sep 17 00:00:00 2001 From: /dev/humancontroller Date: Sun, 14 Apr 2013 18:33:26 +0200 Subject: [PATCH] drop some useless return statements --- code/botlib/be_ai_char.c | 3 --- code/botlib/be_ai_chat.c | 1 - code/botlib/be_ai_goal.c | 1 - code/cgame/cg_particles.c | 1 - code/client/cl_keys.c | 1 - code/qcommon/common.c | 2 -- code/qcommon/files.c | 1 - code/qcommon/vm_powerpc.c | 2 -- code/renderergl1/tr_surface.c | 1 - code/renderergl2/tr_surface.c | 1 - code/tools/asm/q3asm.c | 2 -- code/tools/lcc/cpp/cpp.c | 1 - code/tools/lcc/cpp/include.c | 1 - code/tools/lcc/cpp/macro.c | 1 - code/zlib/inffast.c | 1 - 15 files changed, 20 deletions(-) diff --git a/code/botlib/be_ai_char.c b/code/botlib/be_ai_char.c index b94c4e9a..4adb2812 100644 --- a/code/botlib/be_ai_char.c +++ b/code/botlib/be_ai_char.c @@ -760,14 +760,11 @@ void Characteristic_String(int character, int index, char *buf, int size) { strncpy(buf, ch->c[index].value.string, size-1); buf[size-1] = '\0'; - return; } //end if else { botimport.Print(PRT_ERROR, "characteristic %d is not a string\n", index); - return; } //end else if - return; } //end of the function Characteristic_String //=========================================================================== // diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c index b1a9bc4f..e90aaddc 100644 --- a/code/botlib/be_ai_chat.c +++ b/code/botlib/be_ai_chat.c @@ -1506,7 +1506,6 @@ void BotMatchVariable(bot_match_t *match, int variable, char *buf, int size) { strcpy(buf, ""); } //end else - return; } //end of the function BotMatchVariable //=========================================================================== // diff --git a/code/botlib/be_ai_goal.c b/code/botlib/be_ai_goal.c index be15d9af..3a5d01ab 100644 --- a/code/botlib/be_ai_goal.c +++ b/code/botlib/be_ai_goal.c @@ -691,7 +691,6 @@ void BotGoalName(int number, char *name, int size) } //end for } //end for strcpy(name, ""); - return; } //end of the function BotGoalName //=========================================================================== // diff --git a/code/cgame/cg_particles.c b/code/cgame/cg_particles.c index 2cccaad7..53507ad5 100644 --- a/code/cgame/cg_particles.c +++ b/code/cgame/cg_particles.c @@ -1320,7 +1320,6 @@ void CG_ParticleExplosion (char *animStr, vec3_t origin, vec3_t vel, int duratio // Rafael Shrapnel void CG_AddParticleShrapnel (localEntity_t *le) { - return; } // done. diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c index be2a93a9..f0751efb 100644 --- a/code/client/cl_keys.c +++ b/code/client/cl_keys.c @@ -1286,7 +1286,6 @@ void CL_KeyDownEvent( int key, unsigned time ) // send the bound action CL_ParseBinding( key, qtrue, time ); - return; } /* diff --git a/code/qcommon/common.c b/code/qcommon/common.c index 8dfbde91..9d048a3f 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -1411,8 +1411,6 @@ void Com_InitSmallZoneMemory( void ) { Com_Error( ERR_FATAL, "Small zone data failed to allocate %1.1f megs", (float)s_smallZoneTotal / (1024*1024) ); } Z_ClearZone( smallzone, s_smallZoneTotal ); - - return; } void Com_InitZoneMemory( void ) { diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 5955fb15..724175c4 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2810,7 +2810,6 @@ void FS_Which_f( void ) { } Com_Printf("File not found: \"%s\"\n", filename); - return; } diff --git a/code/qcommon/vm_powerpc.c b/code/qcommon/vm_powerpc.c index a2eed8b3..3d9ede65 100644 --- a/code/qcommon/vm_powerpc.c +++ b/code/qcommon/vm_powerpc.c @@ -1961,8 +1961,6 @@ PPC_ComputeCode( vm_t *vm ) di_now = di_first; } } - - return; } static void diff --git a/code/renderergl1/tr_surface.c b/code/renderergl1/tr_surface.c index 4108f443..39b5d9e5 100644 --- a/code/renderergl1/tr_surface.c +++ b/code/renderergl1/tr_surface.c @@ -1202,7 +1202,6 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) { RB_SurfaceAxis(); break; } - return; } static void RB_SurfaceBad( surfaceType_t *surfType ) { diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c index c991d16c..0823e69e 100644 --- a/code/renderergl2/tr_surface.c +++ b/code/renderergl2/tr_surface.c @@ -1561,7 +1561,6 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) { RB_SurfaceAxis(); break; } - return; } static void RB_SurfaceBad( surfaceType_t *surfType ) { diff --git a/code/tools/asm/q3asm.c b/code/tools/asm/q3asm.c index 331ba098..191a9db6 100644 --- a/code/tools/asm/q3asm.c +++ b/code/tools/asm/q3asm.c @@ -250,7 +250,6 @@ static void hashtable_init (hashtable_t *H, int buckets) { H->buckets = buckets; H->table = calloc(H->buckets, sizeof(*(H->table))); - return; } static hashtable_t *hashtable_new (int buckets) @@ -285,7 +284,6 @@ static void hashtable_add (hashtable_t *H, int hashvalue, void *datum) } hc->data = datum; hc->next = 0; - return; } static hashchain_t *hashtable_get (hashtable_t *H, int hashvalue) diff --git a/code/tools/lcc/cpp/cpp.c b/code/tools/lcc/cpp/cpp.c index 1fcffbc5..b999d212 100644 --- a/code/tools/lcc/cpp/cpp.c +++ b/code/tools/lcc/cpp/cpp.c @@ -250,7 +250,6 @@ control(Tokenrow *trp) break; } setempty(trp); - return; } void * diff --git a/code/tools/lcc/cpp/include.c b/code/tools/lcc/cpp/include.c index 1bb88475..54c0b77a 100644 --- a/code/tools/lcc/cpp/include.c +++ b/code/tools/lcc/cpp/include.c @@ -108,7 +108,6 @@ doinclude(Tokenrow *trp) return; syntax: error(ERROR, "Syntax error in #include"); - return; } /* diff --git a/code/tools/lcc/cpp/macro.c b/code/tools/lcc/cpp/macro.c index 49d11297..71102570 100644 --- a/code/tools/lcc/cpp/macro.c +++ b/code/tools/lcc/cpp/macro.c @@ -218,7 +218,6 @@ expand(Tokenrow *trp, Nlist *np) insertrow(trp, ntokc, &ntr); trp->tp -= rowlen(&ntr); dofree(ntr.bp); - return; } /* diff --git a/code/zlib/inffast.c b/code/zlib/inffast.c index bbee92ed..11bcbb0b 100644 --- a/code/zlib/inffast.c +++ b/code/zlib/inffast.c @@ -298,7 +298,6 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ 257 + (end - out) : 257 - (out - end)); state->hold = hold; state->bits = bits; - return; } /*