code cleanup: rename flip_side_name to BKE_deform_flip_side_name

1 files changed, 17 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index a183872552d..dafc0c3c754 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -447,7 +447,7 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default)
 	}
 	else {
 		bDeformGroup *dg;
-		char name[sizeof(dg->name)];
+		char name_flip[sizeof(dg->name)];
 		int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__);
 
 		for (i = 0; i < defbase_tot; i++) {
@@ -461,9 +461,10 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default)
 				if (use_default)
 					map[i] = i;
 
-				flip_side_name(name, dg->name, FALSE);
-				if (strcmp(name, dg->name)) {
-					flip_num = defgroup_name_index(ob, name);
+				BKE_deform_flip_side_name(name_flip, dg->name, false);
+
+				if (!STREQ(name_flip, dg->name)) {
+					flip_num = defgroup_name_index(ob, name_flip);
 					if (flip_num >= 0) {
 						map[i] = flip_num;
 						map[flip_num] = i; /* save an extra lookup */
@@ -485,7 +486,7 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa
 	}
 	else {
 		bDeformGroup *dg;
-		char name[sizeof(dg->name)];
+		char name_flip[sizeof(dg->name)];
 		int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__);
 
 		for (i = 0; i < defbase_tot; i++) {
@@ -494,9 +495,9 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa
 
 		dg = BLI_findlink(&ob->defbase, defgroup);
 
-		flip_side_name(name, dg->name, FALSE);
-		if (strcmp(name, dg->name)) {
-			flip_num = defgroup_name_index(ob, name);
+		BKE_deform_flip_side_name(name_flip, dg->name, false);
+		if (!STREQ(name_flip, dg->name)) {
+			flip_num = defgroup_name_index(ob, name_flip);
 
 			if (flip_num != -1) {
 				map[defgroup] = flip_num;
@@ -514,11 +515,12 @@ int defgroup_flip_index(Object *ob, int index, const bool use_default)
 	int flip_index = -1;
 
 	if (dg) {
-		char name[sizeof(dg->name)];
-		flip_side_name(name, dg->name, 0);
+		char name_flip[sizeof(dg->name)];
+		BKE_deform_flip_side_name(name_flip, dg->name, false);
 
-		if (strcmp(name, dg->name))
-			flip_index = defgroup_name_index(ob, name);
+		if (!STREQ(name_flip, dg->name)) {
+			flip_index = defgroup_name_index(ob, name_flip);
+		}
 	}
 
 	return (flip_index == -1 && use_default) ? index : flip_index;
@@ -602,7 +604,8 @@ void BKE_deform_split_prefix(const char string[MAX_VGROUP_NAME], char pre[MAX_VG
 /* finds the best possible flipped name. For renaming; check for unique names afterwards */
 /* if strip_number: removes number extensions
  * note: don't use sizeof() for 'name' or 'from_name' */
-void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], int strip_number)
+void BKE_deform_flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME],
+                               const bool strip_number)
 {
 	int     len;
 	char    prefix[MAX_VGROUP_NAME]  = "";   /* The part before the facing */
@@ -624,7 +627,7 @@ void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_
 	if (isdigit(name[len - 1])) {
 		index = strrchr(name, '.'); // last occurrence
 		if (index && isdigit(index[1])) { // doesnt handle case bone.1abc2 correct..., whatever!
-			if (strip_number == 0) {
+			if (strip_number == false) {
 				BLI_strncpy(number, index, sizeof(number));
 			}
 			*index = 0;