summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-27 14:58:49 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-27 14:58:49 -0700
commit00d7cc0c0b324b1b1c75b97d05423a2dc3af70cf (patch)
treeda7ccf9ac82d892abf7b745187aa84ff7014f95c /path.c
parent65aaa29f7d767acf744796ab47cb3a74dbb1c324 (diff)
parentbb84735c80dbae6408b79b56f574ae672d2232d4 (diff)
downloadgit-00d7cc0c0b324b1b1c75b97d05423a2dc3af70cf.tar.gz
Merge branch 'rs/ring-buffer-wraparound'
The code that we have used for the past 10+ years to cycle 4-element ring buffers turns out to be not quite portable in theoretical world. * rs/ring-buffer-wraparound: hex: make wraparound of the index into ring-buffer explicit
Diffstat (limited to 'path.c')
-rw-r--r--path.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/path.c b/path.c
index a8e72955f6..52d889c88e 100644
--- a/path.c
+++ b/path.c
@@ -25,7 +25,8 @@ static struct strbuf *get_pathname(void)
STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
};
static int index;
- struct strbuf *sb = &pathname_array[3 & ++index];
+ struct strbuf *sb = &pathname_array[index];
+ index = (index + 1) % ARRAY_SIZE(pathname_array);
strbuf_reset(sb);
return sb;
}