Commit 53571f2f0c5cbb30e86aa0b8095f51c09c85761e
2015-11-21T15:16:01
vector: more sensible names for `grow_at`/`shrink_at`
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145
diff --git a/src/apply.c b/src/apply.c
index a9b4935..8768607 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -137,10 +137,10 @@ static int update_hunk(
int error = 0;
if (postlen > prelen)
- error = git_vector_grow_at(
+ error = git_vector_insert_null(
&image->lines, linenum, (postlen - prelen));
else if (prelen > postlen)
- error = git_vector_shrink_at(
+ error = git_vector_remove_range(
&image->lines, linenum, (prelen - postlen));
if (error) {
diff --git a/src/vector.c b/src/vector.c
index 5ad8a73..db1dcf8 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;
diff --git a/src/vector.h b/src/vector.h
index 6399a84..96d149e 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -93,8 +93,8 @@ void git_vector_remove_matching(
void *payload);
int git_vector_resize_to(git_vector *v, size_t new_length);
-int git_vector_grow_at(git_vector *v, size_t idx, size_t grow_len);
-int git_vector_shrink_at(git_vector *v, size_t idx, size_t shrink_len);
+int git_vector_insert_null(git_vector *v, size_t idx, size_t insert_len);
+int git_vector_remove_range(git_vector *v, size_t idx, size_t remove_len);
int git_vector_set(void **old, git_vector *v, size_t position, void *value);
diff --git a/tests/core/vector.c b/tests/core/vector.c
index abc641a..c351655 100644
--- a/tests/core/vector.c
+++ b/tests/core/vector.c
@@ -338,40 +338,40 @@ void test_core_vector__grow_and_shrink(void)
git_vector_insert(&x, (void *)0x09);
git_vector_insert(&x, (void *)0x0a);
- git_vector_shrink_at(&x, 0, 1);
+ git_vector_remove_range(&x, 0, 1);
assert_vector(&x, expected1, ARRAY_SIZE(expected1));
- git_vector_shrink_at(&x, 1, 1);
+ git_vector_remove_range(&x, 1, 1);
assert_vector(&x, expected2, ARRAY_SIZE(expected2));
- git_vector_shrink_at(&x, 4, 3);
+ git_vector_remove_range(&x, 4, 3);
assert_vector(&x, expected3, ARRAY_SIZE(expected3));
- git_vector_shrink_at(&x, 3, 2);
+ git_vector_remove_range(&x, 3, 2);
assert_vector(&x, expected4, ARRAY_SIZE(expected4));
- git_vector_grow_at(&x, 0, 2);
+ git_vector_insert_null(&x, 0, 2);
assert_vector(&x, expected5, ARRAY_SIZE(expected5));
- git_vector_grow_at(&x, 5, 1);
+ git_vector_insert_null(&x, 5, 1);
assert_vector(&x, expected6, ARRAY_SIZE(expected6));
- git_vector_grow_at(&x, 4, 3);
+ git_vector_insert_null(&x, 4, 3);
assert_vector(&x, expected7, ARRAY_SIZE(expected7));
- git_vector_shrink_at(&x, 0, 3);
+ git_vector_remove_range(&x, 0, 3);
assert_vector(&x, expected8, ARRAY_SIZE(expected8));
- git_vector_shrink_at(&x, 1, 2);
+ git_vector_remove_range(&x, 1, 2);
assert_vector(&x, expected9, ARRAY_SIZE(expected9));
- git_vector_shrink_at(&x, 2, 2);
+ git_vector_remove_range(&x, 2, 2);
assert_vector(&x, expectedA, ARRAY_SIZE(expectedA));
- git_vector_shrink_at(&x, 1, 1);
+ git_vector_remove_range(&x, 1, 1);
assert_vector(&x, expectedB, ARRAY_SIZE(expectedB));
- git_vector_shrink_at(&x, 0, 1);
+ git_vector_remove_range(&x, 0, 1);
assert_vector(&x, NULL, 0);
git_vector_free(&x);