Cleanup: 'return' parameters to the end of functions, and use 'r_' prefix for them.

1 files changed, 23 insertions, 22 deletions

diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 6d1ce43c6e6..6676776475c 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -901,8 +901,8 @@ const char *WM_key_event_string(const short type, const bool compact)
 
 /* TODO: also support (some) value, like e.g. double-click? */
 int WM_keymap_item_raw_to_string(const short shift, const short ctrl, const short alt, const short oskey,
-                                 const short keymodifier, const short type,
-                                 char *str, const int len, const bool compact)
+                                 const short keymodifier, const short type, const bool compact,
+                                 const int len, char *r_str)
 {
 #define ADD_SEP if (p != buf) *p++ = ' '; (void)0
 
@@ -959,19 +959,19 @@ int WM_keymap_item_raw_to_string(const short shift, const short ctrl, const shor
 	BLI_assert(p - buf < sizeof(buf));
 
 	/* We need utf8 here, otherwise we may 'cut' some unicode chars like arrows... */
-	return BLI_strncpy_utf8_rlen(str, buf, len);
+	return BLI_strncpy_utf8_rlen(r_str, buf, len);
 
 #undef ADD_SEP
 }
 
-int WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, const int len, const bool compact)
+int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int len, char *r_str)
 {
 	return WM_keymap_item_raw_to_string(kmi->shift, kmi->ctrl, kmi->alt, kmi->oskey,
-	                                    kmi->keymodifier, kmi->type, str, len, compact);
+	                                    kmi->keymodifier, kmi->type, compact, len, r_str);
 }
 
 int WM_modalkeymap_operator_items_to_string(
-        wmOperatorType *ot, const int propvalue, char *str, const int len, const bool compact)
+        wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str)
 {
 	wmKeyMap *km = ot->modalkeymap;
 	int totlen = 0;
@@ -986,13 +986,13 @@ int WM_modalkeymap_operator_items_to_string(
 		     kmi = wm_modalkeymap_find_propvalue_iter(km, kmi, propvalue))
 		{
 			if (add_sep) {
-				str[totlen++] = '/';
-				str[totlen] = '\0';
+				r_str[totlen++] = '/';
+				r_str[totlen] = '\0';
 			}
 			else {
 				add_sep = true;
 			}
-			totlen += WM_keymap_item_to_string(kmi, &str[totlen], len - totlen, compact);
+			totlen += WM_keymap_item_to_string(kmi, compact, len - totlen, &r_str[totlen]);
 		}
 	}
 
@@ -1000,18 +1000,19 @@ int WM_modalkeymap_operator_items_to_string(
 }
 
 char *WM_modalkeymap_operator_items_to_string_buf(
-        wmOperatorType *ot, const int propvalue, char **str, int *available_len, const int max_len, const bool compact)
+        wmOperatorType *ot, const int propvalue, const bool compact,
+        const int max_len, int *r_available_len, char **r_str)
 {
-	char *ret = *str;
+	char *ret = *r_str;
 
-	if (*available_len > 1) {
+	if (*r_available_len > 1) {
 		int used_len = WM_modalkeymap_operator_items_to_string(
-		                   ot, propvalue, ret, min_ii(*available_len, max_len), compact) + 1;
+		                   ot, propvalue, compact, min_ii(*r_available_len, max_len), ret) + 1;
 
-		*available_len -= used_len;
-		*str += used_len;
-		if (*available_len == 0) {
-			(*str)--;  /* So that *str keeps pointing on a valid char, we'll stay on it anyway. */
+		*r_available_len -= used_len;
+		*r_str += used_len;
+		if (*r_available_len == 0) {
+			(*r_str)--;  /* So that *str keeps pointing on a valid char, we'll stay on it anyway. */
 		}
 	}
 	else {
@@ -1078,7 +1079,7 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(
 
 									if (IDP_EqualsProperties_ex(properties, properties_default, is_strict)) {
 										char kmi_str[128];
-										WM_keymap_item_to_string(kmi, kmi_str, sizeof(kmi_str), false);
+										WM_keymap_item_to_string(kmi, false, sizeof(kmi_str), kmi_str);
 										/* Note gievn properties could come from other things than menu entry... */
 										printf("%s: Some set values in menu entry match default op values, "
 										       "this might not be desired!\n", opname);
@@ -1228,7 +1229,7 @@ static wmKeyMapItem *wm_keymap_item_find(
 				kmi = wm_keymap_item_find_props(C, opname, opcontext, properties_default, is_strict, is_hotkey, &km);
 				if (kmi) {
 					char kmi_str[128];
-					WM_keymap_item_to_string(kmi, kmi_str, sizeof(kmi_str), false);
+					WM_keymap_item_to_string(kmi, false, sizeof(kmi_str), kmi_str);
 					printf("%s: Some set values in keymap entry match default op values, "
 					       "this might not be desired!\n", opname);
 					printf("\tkm: '%s', kmi: '%s'\n", km->idname, kmi_str);
@@ -1254,13 +1255,13 @@ static wmKeyMapItem *wm_keymap_item_find(
 
 char *WM_key_event_operator_string(
         const bContext *C, const char *opname, int opcontext,
-        IDProperty *properties, const bool is_strict, char *str, int len)
+        IDProperty *properties, const bool is_strict, int len, char *r_str)
 {
 	wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, false, is_strict, NULL);
 	
 	if (kmi) {
-		WM_keymap_item_to_string(kmi, str, len, false);
-		return str;
+		WM_keymap_item_to_string(kmi, false, len, r_str);
+		return r_str;
 	}
 
 	return NULL;