mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 12:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

garray: implement ga_concat_strings_sep

Browse Source 
A generalized version of ga_concat_strings that can handle any separator.
Reimplement ga_concat_strings on top of it.
This commit is contained in:
Nicolas Hillegeer
2014-04-26 19:49:02 +02:00
committed by Thiago de Arruda
parent cf68eda287
commit 104000eff6
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/garray.c
View File

@@ -96,6 +96,40 @@ void ga_remove_duplicate_strings(garray_T *gap)
}
}
/// For a growing array that contains a list of strings: concatenate all the
/// strings with sep as separator.
///
/// @param gap
///
/// @returns the concatenated strings
char_u *ga_concat_strings_sep(const garray_T *gap, const char *sep)
{
const size_t nelem = (size_t) gap->ga_len;
const char **strings = gap->ga_data;
if (nelem == 0) {
return (char_u *) xstrdup("");
}
size_t len = 0;
for (size_t i = 0; i < nelem; i++) {
len += strlen(strings[i]);
}
// add some space for the (num - 1) separators
len += (nelem - 1) * strlen(sep);
char *const ret = xmallocz(len);
char *s = ret;
for (size_t i = 0; i < nelem - 1; i++) {
s = xstpcpy(s, strings[i]);
s = xstpcpy(s, sep);
}
s = xstpcpy(s, strings[nelem - 1]);
return (char_u *) ret;
}
/// For a growing array that contains a list of strings: concatenate all the
/// strings with a separating comma.
///
@@ -104,26 +138,7 @@ void ga_remove_duplicate_strings(garray_T *gap)
/// @returns the concatenated strings
char_u* ga_concat_strings(garray_T *gap)
{
const int nelem = gap->ga_len;
const char **data = gap->ga_data;
size_t len = 0;
for (int i = 0; i < nelem; ++i) {
len += strlen(data[i]) + 1;
}
char *const ret = xmallocz(len);
char *s = ret;
*s = NUL;
for (int i = 0; i < nelem; ++i) {
s = xstpcpy(s, data[i]);
if (i < nelem - 1) {
s = xstpcpy(s, ",");
}
}
return (char_u *) ret;
return ga_concat_strings_sep(gap, ",");
}
/// Concatenate a string to a growarray which contains characters.

2
src/garray.h
View File

@@ -20,6 +20,8 @@ void ga_clear(garray_T *gap);
void ga_clear_strings(garray_T *gap);
void ga_init(garray_T *gap, int itemsize, int growsize);
void ga_grow(garray_T *gap, int n);
char_u *ga_concat_strings_sep(const garray_T *gap, const char *sep)
FUNC_ATTR_NONNULL_RET;
char_u *ga_concat_strings(garray_T *gap) FUNC_ATTR_NONNULL_RET;
void ga_remove_duplicate_strings(garray_T *gap);
void ga_concat(garray_T *gap, char_u *s);