diff options
| -rw-r--r-- | src/garray.c | 21 | ||||
| -rw-r--r-- | src/garray.h | 1 | ||||
| -rw-r--r-- | src/term.c | 4 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/garray.c b/src/garray.c index 264001f934..19a5a98f80 100644 --- a/src/garray.c +++ b/src/garray.c @@ -17,7 +17,11 @@ void ga_clear(garray_T *gap) { 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. @@ -32,17 +36,6 @@ void ga_clear_strings(garray_T *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. /// /// @param gap @@ -50,7 +43,9 @@ void ga_init(garray_T *gap) /// @param 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_growsize = growsize; } diff --git a/src/garray.h b/src/garray.h index c3631a8bd9..d7c8bc4425 100644 --- a/src/garray.h +++ b/src/garray.h @@ -16,7 +16,6 @@ typedef struct growarray { void ga_clear(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); int ga_grow(garray_T *gap, int n); char_u *ga_concat_strings(garray_T *gap); diff --git a/src/term.c b/src/term.c index d1bb4ed4e9..0b7462d232 100644 --- a/src/term.c +++ b/src/term.c @@ -4716,9 +4716,7 @@ translate_mapping ( int cpo_special; int cpo_keycode; - ga_init(&ga); - ga.ga_itemsize = 1; - ga.ga_growsize = 40; + ga_init2(&ga, 1, 40); cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL); cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL); |