summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorTimo Sirainen <tss@iki.fi>2005-08-09 15:30:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 05:28:19 (GMT)
commit4ec99bf080f2d95c7c3d706f65eea1c6b9302f23 (patch)
treed4645413f012a970eb7744004fe829aa2786a067 /apply.c
parent96ad15ae2ff6416cf04c4c75a11783632cdc8fb4 (diff)
downloadgit-4ec99bf080f2d95c7c3d706f65eea1c6b9302f23.zip
git-4ec99bf080f2d95c7c3d706f65eea1c6b9302f23.tar.gz
git-4ec99bf080f2d95c7c3d706f65eea1c6b9302f23.tar.bz2
[PATCH] -Werror fixes
GCC's format __attribute__ is good for checking errors, especially with -Wformat=2 parameter. This fixes most of the reported problems against 2005-08-09 snapshot.
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index c671d9e..81607c0 100644
--- a/apply.c
+++ b/apply.c
@@ -563,7 +563,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
struct fragment dummy;
if (parse_fragment_header(line, len, &dummy) < 0)
continue;
- error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
+ error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
}
if (size < len + 6)
@@ -968,7 +968,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
while (frag) {
if (apply_one_fragment(desc, frag) < 0)
- return error("patch failed: %s:%d", patch->old_name, frag->oldpos);
+ return error("patch failed: %s:%ld", patch->old_name, frag->oldpos);
frag = frag->next;
}
return 0;