diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:33:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:33:52 -0800 |
| commit | 4e4b55dd0f5b4644767265f7c16a8b370278ce56 (patch) | |
| tree | 67412de0f549d86f89bf2c05f4c39487a817fb44 /combine-diff.c | |
| parent | Documentation: link in 1.5.0.2 material to the top documentation page. (diff) | |
| parent | git-apply: do not fix whitespaces on context lines. (diff) | |
| download | git-4e4b55dd0f5b4644767265f7c16a8b370278ce56.tar.gz git-4e4b55dd0f5b4644767265f7c16a8b370278ce56.zip | |
Merge branch 'maint'
* maint:
git-apply: do not fix whitespaces on context lines.
diff --cc: integer overflow given a 2GB-or-larger file
mailinfo: do not get confused with logical lines that are too long.
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c index 6b7c6be959..044633d164 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -684,7 +684,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, goto deleted_file; if (S_ISLNK(st.st_mode)) { - int len = st.st_size; + size_t len = st.st_size; result_size = len; result = xmalloc(len + 1); if (result_size != readlink(elem->path, result, len)) { @@ -697,8 +697,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, } else if (0 <= (fd = open(elem->path, O_RDONLY)) && !fstat(fd, &st)) { - int len = st.st_size; - int sz = 0; + size_t len = st.st_size; + size_t sz = 0; elem->mode = canon_mode(st.st_mode); result_size = len; |