commit - bb90ca7bc134f43cfda3c6f5e5d0faac9f116820
commit + fd8b4acb31083b84aa6c11e7d87a13c09c4a73f2
blob - df3b2f9562622e56b500c23967c5c8f31fdcdaa5
blob + fb9c075a4d4365bb17d11dfec773e37ffe801d0e
--- got/got.c
+++ got/got.c
static const struct got_error *
patch_progress(void *arg, const char *old, const char *new,
- unsigned char status, const struct got_error *error, long old_from,
- long old_lines, long new_from, long new_lines, long offset,
+ unsigned char status, const struct got_error *error, int old_from,
+ int old_lines, int new_from, int new_lines, int offset,
int ws_mangled, const struct got_error *hunk_err)
{
const char *path = new == NULL ? old : new;
fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
if (offset != 0 || hunk_err != NULL || ws_mangled) {
- printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
+ printf("@@ -%d,%d +%d,%d @@ ", old_from,
old_lines, new_from, new_lines);
if (hunk_err != NULL)
printf("%s\n", hunk_err->msg);
else if (offset != 0)
- printf("applied with offset %ld\n", offset);
+ printf("applied with offset %d\n", offset);
else
printf("hunk contains mangled whitespace\n");
}
blob - e72ded72ccf8311606f1c945e5241311de5cc179
blob + 3d08eea48e4a52a62094553e103775d364d22f90
--- include/got_patch.h
+++ include/got_patch.h
*/
typedef const struct got_error *(*got_patch_progress_cb)(void *,
const char *, const char *, unsigned char, const struct got_error *,
- long, long, long, long, long, int, const struct got_error *);
+ int, int, int, int, int, int, const struct got_error *);
/*
* Apply the (already opened) patch to the repository and register the