diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:28 +0300 |
commit | 3a14fdec88125c4fd093f938cf406231b932e3a2 (patch) | |
tree | 1b67f5143fdd6b3be964a2e57ac65c557d1fe566 /builtin/pack-objects.c | |
parent | 257507a35e1d13d8849bbdf9324a060232a82bdf (diff) | |
parent | 33de80b1d50773f79e380eff33b4fc5c8ae1dd25 (diff) |
Merge branch 'sl/const'
Code cleanup.
* sl/const:
various: tighten constness of some local variables
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r-- | builtin/pack-objects.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 68e2e66db2..a9fac7c128 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1902,10 +1902,10 @@ static int type_size_sort(const void *_a, const void *_b) { const struct object_entry *a = *(struct object_entry **)_a; const struct object_entry *b = *(struct object_entry **)_b; - enum object_type a_type = oe_type(a); - enum object_type b_type = oe_type(b); - unsigned long a_size = SIZE(a); - unsigned long b_size = SIZE(b); + const enum object_type a_type = oe_type(a); + const enum object_type b_type = oe_type(b); + const unsigned long a_size = SIZE(a); + const unsigned long b_size = SIZE(b); if (a_type > b_type) return -1; @@ -1920,7 +1920,7 @@ static int type_size_sort(const void *_a, const void *_b) if (a->preferred_base < b->preferred_base) return 1; if (use_delta_islands) { - int island_cmp = island_delta_cmp(&a->idx.oid, &b->idx.oid); + const int island_cmp = island_delta_cmp(&a->idx.oid, &b->idx.oid); if (island_cmp) return island_cmp; } @@ -2167,7 +2167,7 @@ static unsigned int check_delta_limit(struct object_entry *me, unsigned int n) struct object_entry *child = DELTA_CHILD(me); unsigned int m = n; while (child) { - unsigned int c = check_delta_limit(child, n + 1); + const unsigned int c = check_delta_limit(child, n + 1); if (m < c) m = c; child = DELTA_SIBLING(child); @@ -2222,7 +2222,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size, while (window_memory_limit && mem_usage > window_memory_limit && count > 1) { - uint32_t tail = (idx + window - count) % window; + const uint32_t tail = (idx + window - count) % window; mem_usage -= free_unpacked(array + tail); count--; } |