Skip to content

Commit d2da68a

Browse files
committed
Merge branch 'rs/ring-buffer-wraparound' into next
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
2 parents 8d9325f + bb84735 commit d2da68a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

hex.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ char *sha1_to_hex(const unsigned char *sha1)
7878
{
7979
static int bufno;
8080
static char hexbuffer[4][GIT_SHA1_HEXSZ + 1];
81-
return sha1_to_hex_r(hexbuffer[3 & ++bufno], sha1);
81+
bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
82+
return sha1_to_hex_r(hexbuffer[bufno], sha1);
8283
}
8384

8485
char *oid_to_hex(const struct object_id *oid)

path.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ static struct strbuf *get_pathname(void)
2525
STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
2626
};
2727
static int index;
28-
struct strbuf *sb = &pathname_array[3 & ++index];
28+
struct strbuf *sb = &pathname_array[index];
29+
index = (index + 1) % ARRAY_SIZE(pathname_array);
2930
strbuf_reset(sb);
3031
return sb;
3132
}

0 commit comments

Comments
 (0)