summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-05 20:18:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-05 20:18:13 (GMT)
commitace5348dcb427bbce015a42a21a46dc02ae1b37b (patch)
treefed189ce949052d5c6b52c888f5437d3bccccc9f /builtin
parenta878e7e62b4826a95effa1420cff47807f9cb88b (diff)
parentfdcdb778551b904d57c127d9a3546f6a7c8792d3 (diff)
downloadgit-ace5348dcb427bbce015a42a21a46dc02ae1b37b.zip
git-ace5348dcb427bbce015a42a21a46dc02ae1b37b.tar.gz
git-ace5348dcb427bbce015a42a21a46dc02ae1b37b.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 9216f7b..cb13ab7 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)