diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/branch.c | 2 | ||||
| -rw-r--r-- | src/diff_output.c | 4 | ||||
| -rw-r--r-- | src/diff_output.h | 2 | ||||
| -rw-r--r-- | src/tree.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/branch.c b/src/branch.c index 3959409c5..975a43dbd 100644 --- a/src/branch.c +++ b/src/branch.c @@ -348,7 +348,7 @@ int git_branch_tracking_name( if (tracking_branch_name_out) git_buf_copy_cstr(tracking_branch_name_out, buffer_size, &buf); - error = buf.size + 1; + error = (int)buf.size + 1; cleanup: git_buf_free(&buf); diff --git a/src/diff_output.c b/src/diff_output.c index 4f1064b7f..c2c259161 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -1603,8 +1603,8 @@ int git_diff_patch_get_line_in_hunk( if (line_origin) *line_origin = line->origin; if (content) *content = line->ptr; if (content_len) *content_len = line->len; - if (old_lineno) *old_lineno = line->oldno; - if (new_lineno) *new_lineno = line->newno; + if (old_lineno) *old_lineno = (int)line->oldno; + if (new_lineno) *new_lineno = (int)line->newno; return 0; diff --git a/src/diff_output.h b/src/diff_output.h index ae1a491ec..083355676 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -42,7 +42,7 @@ typedef struct diff_patch_line diff_patch_line; struct diff_patch_line { const char *ptr; size_t len; - int lines, oldno, newno; + size_t lines, oldno, newno; char origin; }; diff --git a/src/tree.c b/src/tree.c index e05105a9d..59bd92ab1 100644 --- a/src/tree.c +++ b/src/tree.c @@ -355,7 +355,7 @@ size_t git_tree_entrycount(const git_tree *tree) unsigned int git_treebuilder_entrycount(git_treebuilder *bld) { assert(bld); - return bld->entries.length; + return (int)bld->entries.length; } static int tree_error(const char *str, const char *path) |