patch: drop some warnings

diff --git a/src/diff_print.c b/src/diff_print.c
index daba9f1ca024991a533d20816cd6e5274b3ec6c9..e52386991695001d5f5ae685b4545ec25a6cd1ca 100644 (file)
--- 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 8ba75373a0400749f00d46fa5e537e240015e557..25193b6b7fb379d92b92a95091a4b5a8bc35685d 100644 (file)
--- 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;
 }