summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2009-07-22 21:34:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-23 04:57:41 (GMT)
commit98cb6f30f708ef416572bf65bd26ac9f998ae0dc (patch)
treebed685d6c61a21dd9884a97606df16f1697408d0
parentf630cfda8800aee03c7eb2fcd0f840730fbe43b9 (diff)
downloadgit-98cb6f30f708ef416572bf65bd26ac9f998ae0dc.zip
git-98cb6f30f708ef416572bf65bd26ac9f998ae0dc.tar.gz
git-98cb6f30f708ef416572bf65bd26ac9f998ae0dc.tar.bz2
janitor: add DIV_ROUND_UP and use it.
Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-compat-util.h2
-rw-r--r--help.c2
-rw-r--r--preload-index.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 6dfc0dd..9f941e4 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -37,6 +37,8 @@
#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 DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+
/* Approximation of the length of the decimal representation of this type. */
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
diff --git a/help.c b/help.c
index fd87bb5..6c46d8b 100644
--- a/help.c
+++ b/help.c
@@ -100,7 +100,7 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest)
if (space < max_cols)
cols = max_cols / space;
- rows = (cmds->cnt + cols - 1) / cols;
+ rows = DIV_ROUND_UP(cmds->cnt, cols);
for (i = 0; i < rows; i++) {
printf(" ");
diff --git a/preload-index.c b/preload-index.c
index 14d5281..9289933 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -76,7 +76,7 @@ static void preload_index(struct index_state *index, const char **pathspec)
if (threads > MAX_PARALLEL)
threads = MAX_PARALLEL;
offset = 0;
- work = (index->cache_nr + threads - 1) / threads;
+ work = DIV_ROUND_UP(index->cache_nr, threads);
for (i = 0; i < threads; i++) {
struct thread_data *p = data+i;
p->index = index;