From 79defc2ef136a44de4b216783df644652270e1a8 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 6 Mar 2014 11:36:58 +0100 Subject: [PATCH] -Wunreachable-code reverted. Visual Studio doesn't like it --- arangod/Ahuacatl/ahuacatl-access-optimiser.c | 4 ++++ arangod/Ahuacatl/ahuacatl-scope.c | 2 ++ arangod/MRServer/mr-actions.cpp | 1 + arangod/Replication/ContinuousSyncer.cpp | 2 ++ arangod/V8Server/v8-query.cpp | 5 +++++ lib/Basics/StringUtils.cpp | 2 ++ lib/BasicsC/json-utilities.c | 4 ++++ lib/MRuby/MRLineEditor.cpp | 4 ++++ lib/MRuby/mr-utils.c | 2 ++ lib/ProgramOptions/program-options.c | 4 ++++ lib/Rest/Handler.h | 3 ++- lib/ShapedJson/shape-accessor.c | 4 ++++ lib/V8/v8-conv.cpp | 2 ++ 13 files changed, 38 insertions(+), 1 deletion(-) diff --git a/arangod/Ahuacatl/ahuacatl-access-optimiser.c b/arangod/Ahuacatl/ahuacatl-access-optimiser.c index 4b1ee4d272..97e3720328 100644 --- a/arangod/Ahuacatl/ahuacatl-access-optimiser.c +++ b/arangod/Ahuacatl/ahuacatl-access-optimiser.c @@ -93,6 +93,8 @@ static const char* TypeName (const TRI_aql_access_e type) { case TRI_AQL_ACCESS_ALL: return "all"; } + + return "unknown"; } //////////////////////////////////////////////////////////////////////////////// @@ -110,6 +112,8 @@ static const char* RangeName (const TRI_aql_range_e type) { case TRI_AQL_RANGE_UPPER_INCLUDED: return "upper (inc)"; } + + return "unknown"; } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/Ahuacatl/ahuacatl-scope.c b/arangod/Ahuacatl/ahuacatl-scope.c index c236180a12..e9176eeb87 100644 --- a/arangod/Ahuacatl/ahuacatl-scope.c +++ b/arangod/Ahuacatl/ahuacatl-scope.c @@ -247,6 +247,8 @@ const char* TRI_TypeNameScopeAql (const TRI_aql_scope_e type) { case TRI_AQL_SCOPE_FUNCTION: return "function"; } + + return "unknown"; } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/MRServer/mr-actions.cpp b/arangod/MRServer/mr-actions.cpp index 35b97efb2c..9f658c74b0 100644 --- a/arangod/MRServer/mr-actions.cpp +++ b/arangod/MRServer/mr-actions.cpp @@ -175,6 +175,7 @@ double MR_float (mrb_state* mrb, mrb_value val) { case MRB_TT_FLOAT: return mrb_float(val); + break; default: return 0; diff --git a/arangod/Replication/ContinuousSyncer.cpp b/arangod/Replication/ContinuousSyncer.cpp index de95cbf9ee..f9e25ac7ca 100644 --- a/arangod/Replication/ContinuousSyncer.cpp +++ b/arangod/Replication/ContinuousSyncer.cpp @@ -958,6 +958,8 @@ int ContinuousSyncer::runContinuousSync (string& errorMsg) { return TRI_ERROR_REPLICATION_APPLIER_STOPPED; } } + + return res; } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/V8Server/v8-query.cpp b/arangod/V8Server/v8-query.cpp index 52cea08263..e919e973b6 100644 --- a/arangod/V8Server/v8-query.cpp +++ b/arangod/V8Server/v8-query.cpp @@ -852,6 +852,11 @@ static TRI_index_operator_t* SetupConditionsBitarrayHelper (TRI_index_t* idx, break; } + + default: { + return 0; + } + } // end of switch (operatorType) return indexOperator; diff --git a/lib/Basics/StringUtils.cpp b/lib/Basics/StringUtils.cpp index 6bed5eccec..0032ce3ed8 100644 --- a/lib/Basics/StringUtils.cpp +++ b/lib/Basics/StringUtils.cpp @@ -3243,6 +3243,8 @@ namespace triagens { offSet = delPos + delLength; } + + return sourceStr; } diff --git a/lib/BasicsC/json-utilities.c b/lib/BasicsC/json-utilities.c index 227a70502f..6dd353f7f8 100644 --- a/lib/BasicsC/json-utilities.c +++ b/lib/BasicsC/json-utilities.c @@ -343,6 +343,9 @@ int TRI_CompareValuesJson (const TRI_json_t* const lhs, return 0; } + + default: + return 0; } } @@ -833,6 +836,7 @@ static uint64_t HashJsonRecursive (uint64_t hash, TRI_json_t const* object) { return hash; } } + return hash; // never reached } //////////////////////////////////////////////////////////////////////////////// diff --git a/lib/MRuby/MRLineEditor.cpp b/lib/MRuby/MRLineEditor.cpp index dcdcdeb6fb..51b23559fe 100644 --- a/lib/MRuby/MRLineEditor.cpp +++ b/lib/MRuby/MRLineEditor.cpp @@ -158,6 +158,10 @@ static int IsCodeBlockOpen (struct mrb_parser_state *parser) case EXPR_MAX_STATE: /* don't know what to do with this token */ break; + + default: + /* this state is unexpected! */ + break; } return code_block_open; diff --git a/lib/MRuby/mr-utils.c b/lib/MRuby/mr-utils.c index eea01e9301..ac910a46de 100644 --- a/lib/MRuby/mr-utils.c +++ b/lib/MRuby/mr-utils.c @@ -187,6 +187,8 @@ mrb_value MR_ObjectJson (mrb_state* mrb, TRI_json_t const* json) { return a; } } + + return mrb_nil_value(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/lib/ProgramOptions/program-options.c b/lib/ProgramOptions/program-options.c index 2fe9811375..9387d4e214 100644 --- a/lib/ProgramOptions/program-options.c +++ b/lib/ProgramOptions/program-options.c @@ -780,6 +780,10 @@ static void VisitProgramOptions (TRI_PO_desc_t * ptr, case TRI_PO_VECTOR_STRING: functions->visitVectorStringNode((TRI_PO_vector_string_t *) ptr, input, output); break; + + default: + printf("type unknown"); + break; } } diff --git a/lib/Rest/Handler.h b/lib/Rest/Handler.h index d24ec47178..c5ad7990a5 100644 --- a/lib/Rest/Handler.h +++ b/lib/Rest/Handler.h @@ -98,9 +98,10 @@ namespace triagens { } case Handler::HANDLER_FAILED: - default: return Job::status_t(Job::JOB_FAILED); } + + return Job::status_t(Job::JOB_FAILED); } status_e status; diff --git a/lib/ShapedJson/shape-accessor.c b/lib/ShapedJson/shape-accessor.c index 5d9ca564f9..83d5cbbb5d 100644 --- a/lib/ShapedJson/shape-accessor.c +++ b/lib/ShapedJson/shape-accessor.c @@ -510,6 +510,10 @@ void TRI_PrintShapeAccessor (TRI_shape_access_t* accessor) { printf(" OP: variable offset at position %lu\n", (unsigned long) pos); break; + + default: + printf(" OP: unknown op code\n"); + return; } } } diff --git a/lib/V8/v8-conv.cpp b/lib/V8/v8-conv.cpp index d7c36b4054..f83a657d3e 100644 --- a/lib/V8/v8-conv.cpp +++ b/lib/V8/v8-conv.cpp @@ -1434,6 +1434,8 @@ v8::Handle TRI_ObjectJson (TRI_json_t const* json) { case TRI_JSON_LIST: return scope.Close(ObjectJsonList(json)); } + + return scope.Close(v8::Undefined()); } ////////////////////////////////////////////////////////////////////////////////