aboutsummaryrefslogtreecommitdiff
path: root/src/garray.c
diff options
context:
space:
mode:
authorNicolas Hillegeer <nicolas@hillegeer.com>2014-04-28 21:07:03 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-29 09:29:10 -0300
commiteea98c4d3b695b9ca95db7ac33231e62cdf88ceb (patch)
treec48634c80de748e8260548db05a3606dddcd2770 /src/garray.c
parent767f0fae0b2f981b4563c5b5e2ffdd2b8ed8e27b (diff)
downloadrneovim-eea98c4d3b695b9ca95db7ac33231e62cdf88ceb.tar.gz
rneovim-eea98c4d3b695b9ca95db7ac33231e62cdf88ceb.tar.bz2
rneovim-eea98c4d3b695b9ca95db7ac33231e62cdf88ceb.zip
garray: refactor and optimize ga_concat
I've checked all uses of ga_concat in the codebase: - ex_cmds2.c - ex_getln.c - eval.c - message.c - regexp-nfa.c - term.c - spell.c None of them concats the garray with itself. This makes it safe to use the faster memcpy() instead of memmove(). This change was also documented.
Diffstat (limited to 'src/garray.c')
-rw-r--r--src/garray.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/garray.c b/src/garray.c
index 8871a8637c..1d9195d7ab 100644
--- a/src/garray.c
+++ b/src/garray.c
@@ -142,15 +142,19 @@ char_u* ga_concat_strings(const garray_T *gap)
}
/// Concatenate a string to a growarray which contains characters.
-/// Note: Does NOT copy the NUL at the end!
+///
+/// WARNING:
+/// - Does NOT copy the NUL at the end!
+/// - The parameter may not overlap with the growing array
///
/// @param gap
/// @param s
-void ga_concat(garray_T *gap, char_u *s)
+void ga_concat(garray_T *gap, const char_u *restrict s)
{
- int len = (int)STRLEN(s);
+ int len = (int)strlen((char *) s);
ga_grow(gap, len);
- memmove((char *)gap->ga_data + gap->ga_len, s, (size_t)len);
+ char *data = gap->ga_data;
+ memcpy(data + gap->ga_len, s, (size_t) len);
gap->ga_len += len;
}