[Bf-blender-cvs] [c04088fed1b] master: Cleanup: Clang-Tidy else-after-return fixes
Sybren A. Stüvel
noreply at git.blender.org
Fri Aug 7 13:48:45 CEST 2020
Commit: c04088fed1b8faea6b2928bb5e09ab367076950c
Author: Sybren A. Stüvel
Date: Fri Aug 7 13:37:22 2020 +0200
Branches: master
https://developer.blender.org/rBc04088fed1b8faea6b2928bb5e09ab367076950c
Cleanup: Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule. This should be the final commit of the series of commits that
addresses this particular rule.
No functional changes.
===================================================================
M .clang-tidy
M intern/guardedalloc/intern/mallocn_guarded_impl.c
M intern/guardedalloc/intern/mallocn_lockfree_impl.c
M source/blender/blentranslation/intern/blt_translation.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/functions/intern/attributes_ref.cc
M source/blender/functions/intern/multi_function_network_evaluation.cc
M source/blender/functions/intern/multi_function_network_optimization.cc
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/ikplugin/intern/iksolver_plugin.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesdna/intern/makesdna.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/render_result.c
M source/blender/render/intern/source/render_texture.c
M source/blender/simulation/intern/hair_volume.cpp
M source/blender/simulation/intern/implicit_blender.c
M source/blender/simulation/intern/particle_function.cc
===================================================================
diff --git a/.clang-tidy b/.clang-tidy
index b166dc931ca..63be71502b7 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -12,7 +12,6 @@ Checks: >
-readability-misleading-indentation,
- -readability-else-after-return,
-readability-inconsistent-declaration-parameter-name,
-readability-redundant-preprocessor,
-readability-function-size,
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index 2c207935e43..6024a9919b3 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -249,9 +249,8 @@ size_t MEM_guarded_allocN_len(const void *vmemh)
memh--;
return memh->len;
}
- else {
- return 0;
- }
+
+ return 0;
}
void *MEM_guarded_dupallocN(const void *vmemh)
@@ -611,12 +610,11 @@ static int compare_len(const void *p1, const void *p2)
if (pb1->len < pb2->len) {
return 1;
}
- else if (pb1->len == pb2->len) {
+ if (pb1->len == pb2->len) {
return 0;
}
- else {
- return -1;
- }
+
+ return -1;
}
void MEM_guarded_printmemlist_stats(void)
@@ -682,7 +680,7 @@ void MEM_guarded_printmemlist_stats(void)
if (a == b) {
continue;
}
- else if (strcmp(printblock[a].name, printblock[b].name) == 0) {
+ if (strcmp(printblock[a].name, printblock[b].name) == 0) {
printblock[b].len += printblock[a].len;
printblock[b].items++;
}
@@ -1213,8 +1211,7 @@ const char *MEM_guarded_name_ptr(void *vmemh)
memh--;
return memh->name;
}
- else {
- return "MEM_guarded_name_ptr(NULL)";
- }
+
+ return "MEM_guarded_name_ptr(NULL)";
}
#endif /* NDEBUG */
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
index b71e2c963eb..8f5c9cf85a9 100644
--- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c
+++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
@@ -94,9 +94,8 @@ size_t MEM_lockfree_allocN_len(const void *vmemh)
if (vmemh) {
return MEMHEAD_FROM_PTR(vmemh)->len & ~((size_t)(MEMHEAD_ALIGN_FLAG));
}
- else {
- return 0;
- }
+
+ return 0;
}
void MEM_lockfree_freeN(void *vmemh)
@@ -436,8 +435,7 @@ const char *MEM_lockfree_name_ptr(void *vmemh)
if (vmemh) {
return "unknown block name ptr";
}
- else {
- return "MEM_lockfree_name_ptr(NULL)";
- }
+
+ return "MEM_lockfree_name_ptr(NULL)";
}
#endif /* NDEBUG */
diff --git a/source/blender/blentranslation/intern/blt_translation.c b/source/blender/blentranslation/intern/blt_translation.c
index 0ca068d4263..00118bc72e6 100644
--- a/source/blender/blentranslation/intern/blt_translation.c
+++ b/source/blender/blentranslation/intern/blt_translation.c
@@ -120,9 +120,9 @@ const char *BLT_translate_do(const char *msgctxt, const char *msgid)
if (BLT_translate()) {
return BLT_pgettext(msgctxt, msgid);
}
- else {
- return msgid;
- }
+
+ return msgid;
+
#else
(void)msgctxt;
return msgid;
@@ -135,9 +135,9 @@ const char *BLT_translate_do_iface(const char *msgctxt, const char *msgid)
if (BLT_translate_iface()) {
return BLT_pgettext(msgctxt, msgid);
}
- else {
- return msgid;
- }
+
+ return msgid;
+
#else
(void)msgctxt;
return msgid;
@@ -150,9 +150,9 @@ const char *BLT_translate_do_tooltip(const char *msgctxt, const char *msgid)
if (BLT_translate_tooltips()) {
return BLT_pgettext(msgctxt, msgid);
}
- else {
- return msgid;
- }
+
+ return msgid;
+
#else
(void)msgctxt;
return msgid;
@@ -165,9 +165,9 @@ const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid
if (BLT_translate_new_dataname()) {
return BLT_pgettext(msgctxt, msgid);
}
- else {
- return msgid;
- }
+
+ return msgid;
+
#else
(void)msgctxt;
return msgid;
diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c
index 80634618f6f..a9d1972bd7e 100644
--- a/source/blender/bmesh/intern/bmesh_query.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -179,13 +179,12 @@ BMLoop *BM_loop_other_vert_loop_by_edge(BMLoop *l, BMEdge *e)
if (l->e == e) {
return l->next;
}
- else if (l->prev->e == e) {
+ if (l->prev->e == e) {
return l->prev;
}
- else {
- BLI_assert(0);
- return NULL;
- }
+
+ BLI_assert(0);
+ return NULL;
}
/**
diff --git a/source/blender/functions/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc
index 8f7f41be079..9f1e7fa65e5 100644
--- a/source/blender/functions/intern/attributes_ref.cc
+++ b/source/blender/functions/intern/attributes_ref.cc
@@ -42,14 +42,13 @@ bool AttributesInfoBuilder::add(StringRef name, const CPPType &type, const void
defaults_.append(dst);
return true;
}
- else {
- const CPPType &stored_type = *types_[names_.index_of_as(name)];
- if (stored_type != type) {
- std::cout << "Warning: Tried to add an attribute twice with different types (" << name
- << ": " << stored_type.name() << ", " << type.name() << ").\n";
- }
- return false;
+
+ const CPPType &stored_type = *types_[names_.index_of_as(name)];
+ if (stored_type != type) {
+ std::cout << "Warning: Tried to add an attribute twice with different types (" << name << ": "
+ << stored_type.name() << ", " << type.name() << ").\n";
}
+ return false;
}
AttributesInfo::AttributesInfo(const AttributesInfoBuilder &builder)
diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc
index 25e983d2eeb..480a048b510 100644
--- a/source/blender/functions/intern/multi_function_network_evaluation.cc
+++ b/source/blender/functions/intern/multi_function_network_evaluation.cc
@@ -519,7 +519,7 @@ MFNetworkEvaluationStorage::~MFNetworkEvaluationStorage()
if (any_value == nullptr) {
continue;
}
- else if (any_value->type == ValueType::OwnSingle) {
+ if (any_value->type == ValueType::OwnSingle) {
OwnSingleValue *value = (OwnSingleValue *)any_value;
GMutableSpan span = value->span;
const CPPType &type = span.type();
@@ -710,10 +710,9 @@ GMutableSpan MFNetworkEvaluationStorage::get_single_output__full(const MFOutputS
return span;
}
- else {
- BLI_assert(any_value->type == ValueType::OutputSingle);
- return ((OutputSingleValue *)any_value)->span;
- }
+
+ BLI_assert(any_value->type == ValueType::OutputSingle);
+ return ((OutputSingleValue *)any_value)->span;
}
GMutableSpan MFNetworkEvaluationStorage::get_single_output__single(const MFOutputSocket &socket)
@@ -729,12 +728,11 @@ GMutableSpan MFNetworkEvaluationStorage::get_single_output__single(const MFOutpu
return value->span;
}
- else {
- BLI_assert(any_value->type == ValueType::OutputSingle);
- GMutableSpan span = ((OutputSingleValue *)any_value)->span;
- BLI_assert(span.size() == 1);
- return span;
- }
+
+ BLI_assert(any_value->type == ValueType::OutputSingle);
+ GMutableSpan span = ((OutputSingleValue *)any_value)->span;
+ BLI_assert(span.size() == 1);
+ return span;
}
GVectorArray &MFNetworkEvaluationStorage::get_vector_output__full(const MFOutputSocket &socket)
@@ -749,10 +747,9 @@ GVectorArray &MFNetworkEvaluationStorage::get_vector_output__full(const MFOutput
return *value->vector_array;
}
- else {
- BLI_assert(any_value->type == ValueType::OutputVector);
- return *((OutputVectorValue *)any_value)->vector_array;
- }
+
+ BLI_assert(any_value->type == ValueType::OutputVector);
+ return *((OutputVectorValue *)any_value)->vector_array;
}
GVectorArray &MFNetworkEvaluationStorage::get_vector_output__single(const MFOutputSocket &socket)
@@ -767,12 +764,11 @@ GVectorArray &MFNetworkEvaluationStorage::get_vector_output__single(const MFOutp
return *value->vector_array;
}
- else {
- BLI_assert(any_value->type == ValueType::OutputVector);
- GVectorArray &vector_array = *((OutputVectorValue *)any_value)->vector_array;
- BLI_assert(vector_array.size() == 1);
- return vector_array;
- }
+
+ BLI_assert(any_value->type == ValueType::OutputVector);
+ GVectorArray &vector_array = *((OutputVectorValue *)any_value)->vector_array;
+ BLI_assert(vector_array.size() == 1);
+ return vector_array;
}
GMutableSpan MFNetworkEvaluationStorage::get_mutable_single__full(const MFInputSocket &input,
@@ -955,15 +951,14 @@ GVSpan MFNetworkEvaluationStorage::get_single_input__full(const MFInputSocket &s
if (value->is_single_allocated) {
return GVSpan::FromSingle(value->span.type(), value->span.data(), min_array_size_);
}
- else {
- return value->span;
- }
+
+ return value->span;
}
- else if (any_value->type == ValueType::InputSingle) {
+ if (any_value->type == ValueType::InputSingle) {
InputSingleValue *value = (InputSingleValue *)any_value;
return value->virtual_span;
}
- else if (any_value->type == ValueType::OutputSingle) {
+ if (any_value->type == ValueType::OutputSingle) {
OutputSingleValue *value = (OutputSingleValue *)any_value;
BLI_assert(value->is_computed);
return value->span;
@@ -984,12 +979,12 @@ GVSpan MFNetworkEvaluationStorage::get_single_input__single(const MFInputSocket
BLI_assert(value->span.size() == 1);
return value->span;
}
- else if (any_value->type == ValueType::InputSingle) {
+ if (any_value->type == ValueType::InputSingle) {
InputSingleValue *value = (InputSingleValue *)any_value;
BLI_assert(value->virtual_span.is_single_element());
return value->virtual_span;
}
- else if (any_value->type == ValueType::OutputSingle) {
+ if (any_value->type == ValueType::OutputSingle) {
OutputSingleValue *value = (OutputSingleValue *)any_value;
BLI_assert(value->is_computed);
BLI_assert(value->span.size() == 1);
@@ -1012,15 +1007,14 @@ GVArraySpan MFNetworkEvaluationStorage::get_vector_input__full(const MFInputSock
GSpan span = (*value->vector_array)[0];
return GVArraySpan(span, min_array_size_);
}
- else {
- return *value->vector_array;
- }
+
+ return *value->vector_array;
}
- else if (any
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list