Commit 98cb6f30 authored by Pierre Habouzit's avatar Pierre Habouzit Committed by Junio C Hamano

janitor: add DIV_ROUND_UP and use it.

Signed-off-by: default avatarPierre Habouzit <madcoder@debian.org>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent f630cfda
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (bitsizeof(x) - (bits)))) #define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (bitsizeof(x) - (bits))))
#define HAS_MULTI_BITS(i) ((i) & ((i) - 1)) /* checks if an integer has more than 1 bit set */ #define HAS_MULTI_BITS(i) ((i) & ((i) - 1)) /* checks if an integer has more than 1 bit set */
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
/* Approximation of the length of the decimal representation of this type. */ /* Approximation of the length of the decimal representation of this type. */
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) #define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
......
...@@ -100,7 +100,7 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest) ...@@ -100,7 +100,7 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest)
if (space < max_cols) if (space < max_cols)
cols = max_cols / space; cols = max_cols / space;
rows = (cmds->cnt + cols - 1) / cols; rows = DIV_ROUND_UP(cmds->cnt, cols);
for (i = 0; i < rows; i++) { for (i = 0; i < rows; i++) {
printf(" "); printf(" ");
......
...@@ -76,7 +76,7 @@ static void preload_index(struct index_state *index, const char **pathspec) ...@@ -76,7 +76,7 @@ static void preload_index(struct index_state *index, const char **pathspec)
if (threads > MAX_PARALLEL) if (threads > MAX_PARALLEL)
threads = MAX_PARALLEL; threads = MAX_PARALLEL;
offset = 0; offset = 0;
work = (index->cache_nr + threads - 1) / threads; work = DIV_ROUND_UP(index->cache_nr, threads);
for (i = 0; i < threads; i++) { for (i = 0; i < threads; i++) {
struct thread_data *p = data+i; struct thread_data *p = data+i;
p->index = index; p->index = index;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment