diff options
| author | Waldek Maleska <w.maleska@gmail.com> | 2015-10-26 14:15:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 13:24:03 -0700 |
| commit | fdcdb778551b904d57c127d9a3546f6a7c8792d3 (patch) | |
| tree | adcc39758e0c2e43d4806a22206c86dd6073fcc1 | |
| parent | 56a1a3ab449df33268776a8b72a301d3ee67ad8d (diff) | |
| download | git-js/misc-fixes.tar.gz | |
Correct fscanf formatting string for I64u valuesjs/misc-fixes
This fix is probably purely cosmetic because PRIuMAX is likely identical
to SCNuMAX. Nevertheless, when using a function of the scanf() family,
the correct interpolation to use is the latter, not the former.
Signed-off-by: Waldek Maleska <w.maleska@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/gc.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 005adbebea..9023aee23c 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -222,7 +222,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) diff --git a/git-compat-util.h b/git-compat-util.h index 6a16e20966..33bb762296 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -237,6 +237,10 @@ extern char *gitbasename(char *); #define PRIuMAX "llu" #endif +#ifndef SCNuMAX +#define SCNuMAX PRIuMAX +#endif + #ifndef PRIu32 #define PRIu32 "u" #endif |