diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:06:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:00 -0700 |
| commit | 808d11926351018f73db69d54e5920adef578f62 (patch) | |
| tree | 92c508142f25974235410353ce5c6f45c8d75207 /builtin | |
| parent | e88e424f4c9d9c8b622cc6a2ebe6e1fa058676f5 (diff) | |
| parent | fdcdb778551b904d57c127d9a3546f6a7c8792d3 (diff) | |
| download | git-808d11926351018f73db69d54e5920adef578f62.tar.gz | |
Merge branch 'js/misc-fixes'
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 b677923ffc..df3e454447 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) |