patch 9.0.1738: Duplicate code to reverse a string
Problem: Duplicate code to reverse a string
Solution: Move reverse_text() to strings.c and remove string_reverse().
closes: #12847
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/strings.c b/src/strings.c
index 25c32ec..9936744 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -770,6 +770,36 @@
return dest;
}
+#if defined(FEAT_EVAL) || defined(FEAT_RIGHTLEFT) || defined(PROTO)
+/*
+ * Reverse text into allocated memory.
+ * Returns the allocated string, NULL when out of memory.
+ */
+ char_u *
+reverse_text(char_u *s)
+{
+ size_t len = STRLEN(s);
+ char_u *rev = alloc(len + 1);
+ if (rev == NULL)
+ return NULL;
+
+ for (size_t s_i = 0, rev_i = len; s_i < len; ++s_i)
+ {
+ if (has_mbyte)
+ {
+ int mb_len = (*mb_ptr2len)(s + s_i);
+ rev_i -= mb_len;
+ mch_memmove(rev + rev_i, s + s_i, mb_len);
+ s_i += mb_len - 1;
+ }
+ else
+ rev[--rev_i] = s[s_i];
+ }
+ rev[len] = NUL;
+ return rev;
+}
+#endif
+
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return string "str" in ' quotes, doubling ' characters.
@@ -855,47 +885,6 @@
}
/*
- * Reverse the string in 'str' and set the result in 'rettv'.
- */
- void
-string_reverse(char_u *str, typval_T *rettv)
-{
- rettv->v_type = VAR_STRING;
- rettv->vval.v_string = NULL;
- if (str == NULL)
- return;
-
- char_u *rstr = vim_strsave(str);
- rettv->vval.v_string = rstr;
- if (rstr == NULL || *str == NUL)
- return;
-
- size_t len = STRLEN(rstr);
- if (has_mbyte)
- {
- char_u *src = str;
- char_u *dest = rstr + len;
-
- while (src < str + len)
- {
- int clen = mb_ptr2len(src);
- dest -= clen;
- mch_memmove(dest, src, (size_t)clen);
- src += clen;
- }
- }
- else
- {
- for (size_t i = 0; i < len / 2; i++)
- {
- char tmp = rstr[len - i - 1];
- rstr[len - i - 1] = rstr[i];
- rstr[i] = tmp;
- }
- }
-}
-
-/*
* Make a typval_T of the first character of "input" and store it in "output".
* Return OK or FAIL.
*/