diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:13 -0800 |
| commit | ace5348dcb427bbce015a42a21a46dc02ae1b37b (patch) | |
| tree | fed189ce949052d5c6b52c888f5437d3bccccc9f /builtin | |
| parent | Merge branch 'jc/add-u-A-default-to-top' into maint (diff) | |
| parent | Correct fscanf formatting string for I64u values (diff) | |
| download | tgif-ace5348dcb427bbce015a42a21a46dc02ae1b37b.tar.xz | |
Merge branch 'js/misc-fixes' into maint
Various compilation fixes and squelching of warnings.
* js/misc-fixes:
Correct fscanf formatting string for I64u values
Silence GCC's "cast of pointer to integer of a different size" warning
Squelch warning about an integer overflow
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 9216f7b9e2..cb13ab72c3 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -240,7 +240,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) * running. */ time(NULL) - st.st_mtime <= 12 * 3600 && - fscanf(fp, "%"PRIuMAX" %127c", &pid, locking_host) == 2 && + fscanf(fp, "%"SCNuMAX" %127c", &pid, locking_host) == 2 && /* be gentle to concurrent "gc" on remote hosts */ (strcmp(locking_host, my_host) || !kill(pid, 0) || errno == EPERM); if (fp != NULL) |