summaryrefslogtreecommitdiff
path: root/fsmonitor.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:15 (GMT)
commitea219657a3a3bc10058a8fc623056fa83e231d03 (patch)
tree2737f96cf1d458363a7295efd3a61610c4226fbf /fsmonitor.c
parent90334a8497f3637876806deb159c4d9c39a7899b (diff)
parent5d137fc2c7ba08455b2734c8e2ca9b9a284f3706 (diff)
downloadgit-ea219657a3a3bc10058a8fc623056fa83e231d03.zip
git-ea219657a3a3bc10058a8fc623056fa83e231d03.tar.gz
git-ea219657a3a3bc10058a8fc623056fa83e231d03.tar.bz2
Merge branch 'cb/fsmonitor-intfix' into maint
Variable type fix. * cb/fsmonitor-intfix: fsmonitor: avoid signed integer overflow / infinite loop
Diffstat (limited to 'fsmonitor.c')
-rw-r--r--fsmonitor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fsmonitor.c b/fsmonitor.c
index 1dee0ad..231e83a 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -56,7 +56,7 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
void fill_fsmonitor_bitmap(struct index_state *istate)
{
- int i;
+ unsigned int i;
istate->fsmonitor_dirty = ewah_new();
for (i = 0; i < istate->cache_nr; i++)
if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
@@ -134,7 +134,7 @@ void refresh_fsmonitor(struct index_state *istate)
size_t bol; /* beginning of line */
uint64_t last_update;
char *buf;
- int i;
+ unsigned int i;
if (!core_fsmonitor || istate->fsmonitor_has_run_once)
return;
@@ -192,7 +192,7 @@ void refresh_fsmonitor(struct index_state *istate)
void add_fsmonitor(struct index_state *istate)
{
- int i;
+ unsigned int i;
if (!istate->fsmonitor_last_update) {
trace_printf_key(&trace_fsmonitor, "add fsmonitor");
@@ -225,7 +225,7 @@ void remove_fsmonitor(struct index_state *istate)
void tweak_fsmonitor(struct index_state *istate)
{
- int i;
+ unsigned int i;
int fsmonitor_enabled = git_config_get_fsmonitor();
if (istate->fsmonitor_dirty) {