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

Inline ga_init()

Browse Source
This commit is contained in:
John Schmidt
2014-03-31 17:09:00 +02:00
committed by Thiago de Arruda
parent a4c77ab5f0
commit e02790cad4
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/garray.c
View File

@@ -17,7 +17,11 @@
void ga_clear(garray_T *gap) void ga_clear(garray_T *gap)
{ {
vim_free(gap->ga_data); vim_free(gap->ga_data);
ga_init(gap);
// Initialize growing array without resetting itemsize or growsize
gap->ga_data = NULL;
gap->ga_maxlen = 0;
gap->ga_len = 0;
} }
/// Clear a growing array that contains a list of strings. /// Clear a growing array that contains a list of strings.
@@ -32,17 +36,6 @@ void ga_clear_strings(garray_T *gap)
ga_clear(gap); ga_clear(gap);
} }
/// Initialize a growing array. Don't forget to set ga_itemsize and
/// ga_growsize! Or use ga_init2().
///
/// @param gap
void ga_init(garray_T *gap)
{
gap->ga_data = NULL;
gap->ga_maxlen = 0;
gap->ga_len = 0;
}
/// Initialize a growing array. /// Initialize a growing array.
/// ///
/// @param gap /// @param gap
@@ -50,7 +43,9 @@ void ga_init(garray_T *gap)
/// @param growsize /// @param growsize
void ga_init2(garray_T *gap, int itemsize, int growsize) void ga_init2(garray_T *gap, int itemsize, int growsize)
{ {
ga_init(gap); gap->ga_data = NULL;
gap->ga_maxlen = 0;
gap->ga_len = 0;
gap->ga_itemsize = itemsize; gap->ga_itemsize = itemsize;
gap->ga_growsize = growsize; gap->ga_growsize = growsize;
} }

1
src/garray.h
View File

@@ -16,7 +16,6 @@ typedef struct growarray {
void ga_clear(garray_T *gap); void ga_clear(garray_T *gap);
void ga_clear_strings(garray_T *gap); void ga_clear_strings(garray_T *gap);
void ga_init(garray_T *gap);
void ga_init2(garray_T *gap, int itemsize, int growsize); void ga_init2(garray_T *gap, int itemsize, int growsize);
int ga_grow(garray_T *gap, int n); int ga_grow(garray_T *gap, int n);
char_u *ga_concat_strings(garray_T *gap); char_u *ga_concat_strings(garray_T *gap);

4
src/term.c
View File

@@ -4716,9 +4716,7 @@ translate_mapping (
int cpo_special; int cpo_special;
int cpo_keycode; int cpo_keycode;
ga_init(&ga); ga_init2(&ga, 1, 40);
ga.ga_itemsize = 1;
ga.ga_growsize = 40;
cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL); cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL);
cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL); cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL);