diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-09-24 09:25:10 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-05-26 13:01:06 -0500 |
| commit | f941f035aea73aeda0093a85e514711d006cda22 (patch) | |
| tree | 1073a32d0dcc8c650dfa5747ffdcc2af9d01cf8a | |
| parent | 040ec883a47744349c89178114f8ae2c8324ef57 (diff) | |
| download | libgit2-f941f035aea73aeda0093a85e514711d006cda22.tar.gz | |
patch: drop some warnings
| -rw-r--r-- | src/diff_print.c | 7 | ||||
| -rw-r--r-- | src/patch_parse.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/diff_print.c b/src/diff_print.c index daba9f1ca..e52386991 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 8ba75373a..25193b6b7 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; } |