Commit f941f035aea73aeda0093a85e514711d006cda22
2015-09-24T09:25:10
patch: drop some warnings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/src/diff_print.c b/src/diff_print.c
index daba9f1..e523869 100644
--- a/src/diff_print.c
+++ b/src/diff_print.c
@@ -467,8 +467,7 @@ static int format_binary(
static int diff_print_patch_file_binary_noshow(
diff_print_info *pi, git_diff_delta *delta,
- const char *old_pfx, const char *new_pfx,
- const git_diff_binary *binary)
+ const char *old_pfx, const char *new_pfx)
{
git_buf old_path = GIT_BUF_INIT, new_path = GIT_BUF_INIT;
int error;
@@ -502,7 +501,7 @@ static int diff_print_patch_file_binary(
if ((pi->flags & GIT_DIFF_SHOW_BINARY) == 0)
return diff_print_patch_file_binary_noshow(
- pi, delta, old_pfx, new_pfx, binary);
+ pi, delta, old_pfx, new_pfx);
if (binary->new_file.datalen == 0 && binary->old_file.datalen == 0)
return 0;
@@ -521,7 +520,7 @@ static int diff_print_patch_file_binary(
git_buf_truncate(pi->buf, pre_binary_size);
return diff_print_patch_file_binary_noshow(
- pi, delta, old_pfx, new_pfx, binary);
+ pi, delta, old_pfx, new_pfx);
}
}
diff --git a/src/patch_parse.c b/src/patch_parse.c
index 8ba7537..25193b6 100644
--- a/src/patch_parse.c
+++ b/src/patch_parse.c
@@ -184,7 +184,7 @@ static int parse_header_mode(uint16_t *mode, patch_parse_ctx *ctx)
static int parse_header_oid(
git_oid *oid,
- size_t *oid_len,
+ int *oid_len,
patch_parse_ctx *ctx)
{
size_t len;
@@ -201,7 +201,7 @@ static int parse_header_oid(
parse_advance_chars(ctx, len);
- *oid_len = len;
+ *oid_len = (int)len;
return 0;
}