diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-21 15:16:01 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@github.com> | 2016-05-26 13:01:08 -0500 |
commit | 53571f2f0c5cbb30e86aa0b8095f51c09c85761e (patch) | |
tree | d23f6a18c55417e2355118e5efae5ef8a04b110d /src/vector.c | |
parent | 440e3bae10a4758d5de8d7b8699bf4c412c1a163 (diff) | |
download | libgit2-53571f2f0c5cbb30e86aa0b8095f51c09c85761e.tar.gz |
vector: more sensible names for `grow_at`/`shrink_at`
Diffstat (limited to 'src/vector.c')
-rw-r--r-- | src/vector.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/vector.c b/src/vector.c index 5ad8a738c..db1dcf89a 100644 --- a/src/vector.c +++ b/src/vector.c @@ -331,33 +331,33 @@ int git_vector_resize_to(git_vector *v, size_t new_length) return 0; } -int git_vector_grow_at(git_vector *v, size_t idx, size_t grow_len) +int git_vector_insert_null(git_vector *v, size_t idx, size_t insert_len) { size_t new_length; - assert(grow_len > 0 && idx <= v->length); + assert(insert_len > 0 && idx <= v->length); - GITERR_CHECK_ALLOC_ADD(&new_length, v->length, grow_len); + GITERR_CHECK_ALLOC_ADD(&new_length, v->length, insert_len); if (new_length > v->_alloc_size && resize_vector(v, new_length) < 0) return -1; - memmove(&v->contents[idx + grow_len], &v->contents[idx], + memmove(&v->contents[idx + insert_len], &v->contents[idx], sizeof(void *) * (v->length - idx)); - memset(&v->contents[idx], 0, sizeof(void *) * grow_len); + memset(&v->contents[idx], 0, sizeof(void *) * insert_len); v->length = new_length; return 0; } -int git_vector_shrink_at(git_vector *v, size_t idx, size_t shrink_len) +int git_vector_remove_range(git_vector *v, size_t idx, size_t remove_len) { - size_t new_length = v->length - shrink_len; + size_t new_length = v->length - remove_len; size_t end_idx = 0; - assert(shrink_len > 0); + assert(remove_len > 0); - if (git__add_sizet_overflow(&end_idx, idx, shrink_len)) + if (git__add_sizet_overflow(&end_idx, idx, remove_len)) assert(0); assert(end_idx <= v->length); @@ -366,7 +366,7 @@ int git_vector_shrink_at(git_vector *v, size_t idx, size_t shrink_len) memmove(&v->contents[idx], &v->contents[end_idx], sizeof(void *) * (v->length - end_idx)); - memset(&v->contents[new_length], 0, sizeof(void *) * shrink_len); + memset(&v->contents[new_length], 0, sizeof(void *) * remove_len); v->length = new_length; return 0; |