archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Blenlib, Clang-Tidy else-after-return fixes (incomplete)

Browse Source 
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenlib` module. Not all warnings are
addressed in this commit.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2020-08-07 11:23:02 +02:00
parent e0c51b466f
commit a29686eeb3
59 changed files with 1079 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/blenlib/intern/sort_utils.c
View File

@@ -44,12 +44,11 @@ int BLI_sortutil_cmp_float(const void *a_, const void *b_)
if (a->sort_value > b->sort_value) {
return 1;
}
else if (a->sort_value < b->sort_value) {
if (a->sort_value < b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}
int BLI_sortutil_cmp_float_reverse(const void *a_, const void *b_)
@@ -59,12 +58,11 @@ int BLI_sortutil_cmp_float_reverse(const void *a_, const void *b_)
if (a->sort_value < b->sort_value) {
return 1;
}
else if (a->sort_value > b->sort_value) {
if (a->sort_value > b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}
int BLI_sortutil_cmp_int(const void *a_, const void *b_)
@@ -74,12 +72,11 @@ int BLI_sortutil_cmp_int(const void *a_, const void *b_)
if (a->sort_value > b->sort_value) {
return 1;
}
else if (a->sort_value < b->sort_value) {
if (a->sort_value < b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}
int BLI_sortutil_cmp_int_reverse(const void *a_, const void *b_)
@@ -89,12 +86,11 @@ int BLI_sortutil_cmp_int_reverse(const void *a_, const void *b_)
if (a->sort_value < b->sort_value) {
return 1;
}
else if (a->sort_value > b->sort_value) {
if (a->sort_value > b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}
int BLI_sortutil_cmp_ptr(const void *a_, const void *b_)
@@ -104,12 +100,11 @@ int BLI_sortutil_cmp_ptr(const void *a_, const void *b_)
if (a->sort_value > b->sort_value) {
return 1;
}
else if (a->sort_value < b->sort_value) {
if (a->sort_value < b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}
int BLI_sortutil_cmp_ptr_reverse(const void *a_, const void *b_)
@@ -119,10 +114,9 @@ int BLI_sortutil_cmp_ptr_reverse(const void *a_, const void *b_)
if (a->sort_value < b->sort_value) {
return 1;
}
else if (a->sort_value > b->sort_value) {
if (a->sort_value > b->sort_value) {
return -1;
}
else {
return 0;
}
return 0;
}