diff options
| author | Matthew Plough <matt.plough@gmail.com> | 2015-06-30 19:00:41 -0400 |
|---|---|---|
| committer | Carlos MartÃn Nieto <cmn@dwim.me> | 2015-07-12 19:55:19 +0200 |
| commit | 768f8be31c3fac1b0ed8f4d49cf7176a30586443 (patch) | |
| tree | 93bce70b7e1e0417bd6f843e3ae2eea4d28da0ec /src/checkout.c | |
| parent | 9126ccac969a8da85992f5e3a67b292e59d4d7d0 (diff) | |
| download | libgit2-768f8be31c3fac1b0ed8f4d49cf7176a30586443.tar.gz | |
Fix #3094 - improve use of portable size_t/ssize_t format specifiers.
The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/checkout.c b/src/checkout.c index a94d509d3..4b3acbcce 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1299,8 +1299,8 @@ static int checkout_get_actions( if (counts[CHECKOUT_ACTION__CONFLICT] > 0 && (data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) == 0) { - giterr_set(GITERR_CHECKOUT, "%d %s checkout", - (int)counts[CHECKOUT_ACTION__CONFLICT], + giterr_set(GITERR_CHECKOUT, "%"PRIuZ" %s checkout", + counts[CHECKOUT_ACTION__CONFLICT], counts[CHECKOUT_ACTION__CONFLICT] == 1 ? "conflict prevents" : "conflicts prevent"); error = GIT_ECONFLICT; |