Commit aad5403fe96a88689b9d22a732d464c64a72f8ff
2013-11-05T10:55:54
Fix MSVC 64-bit 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 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
diff --git a/src/blame.c b/src/blame.c
index 192e296..0b4dafb 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -20,7 +20,7 @@
static int hunk_byfinalline_search_cmp(const void *key, const void *entry)
{
- uint32_t lineno = *(size_t*)key;
+ uint16_t lineno = (uint16_t)*(size_t*)key;
git_blame_hunk *hunk = (git_blame_hunk*)entry;
if (lineno < hunk->final_start_line_number)
@@ -145,7 +145,7 @@ void git_blame_free(git_blame *blame)
uint32_t git_blame_get_hunk_count(git_blame *blame)
{
assert(blame);
- return blame->hunks.length;
+ return (uint32_t)blame->hunks.length;
}
const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t index)
@@ -160,7 +160,7 @@ const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t linen
assert(blame);
if (!git_vector_bsearch2( &i, &blame->hunks, hunk_byfinalline_search_cmp, &lineno)) {
- return git_blame_get_hunk_byindex(blame, i);
+ return git_blame_get_hunk_byindex(blame, (uint32_t)i);
}
return NULL;
@@ -211,13 +211,13 @@ static git_blame_hunk *split_hunk_in_vector(
}
new_line_count = hunk->lines_in_hunk - rel_line;
- nh = new_hunk(hunk->final_start_line_number+rel_line, new_line_count,
- hunk->orig_start_line_number+rel_line, hunk->orig_path);
+ nh = new_hunk((uint16_t)(hunk->final_start_line_number+rel_line), (uint16_t)new_line_count,
+ (uint16_t)(hunk->orig_start_line_number+rel_line), hunk->orig_path);
git_oid_cpy(&nh->final_commit_id, &hunk->final_commit_id);
git_oid_cpy(&nh->orig_commit_id, &hunk->orig_commit_id);
/* Adjust hunk that was split */
- hunk->lines_in_hunk -= new_line_count;
+ hunk->lines_in_hunk -= (uint16_t)new_line_count;
git_vector_insert_sorted(vec, nh, NULL);
{
git_blame_hunk *ret = return_new ? nh : hunk;
@@ -374,7 +374,7 @@ static int buffer_hunk_cb(
void *payload)
{
git_blame *blame = (git_blame*)payload;
- size_t wedge_line;
+ uint32_t wedge_line;
GIT_UNUSED(delta);
@@ -420,7 +420,7 @@ static int buffer_line_cb(
} else {
/* Create a new buffer-blame hunk with this line */
shift_hunks_by(&blame->hunks, blame->current_diff_line, 1);
- blame->current_hunk = new_hunk(blame->current_diff_line, 1, 0, blame->path);
+ blame->current_hunk = new_hunk((uint16_t)blame->current_diff_line, 1, 0, blame->path);
git_vector_insert_sorted(&blame->hunks, blame->current_hunk, NULL);
}
blame->current_diff_line++;
@@ -436,7 +436,7 @@ static int buffer_line_cb(
if (!git_vector_search2(&i, &blame->hunks, ptrs_equal_cmp, blame->current_hunk)) {
git_vector_remove(&blame->hunks, i);
free_hunk(blame->current_hunk);
- blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byindex(blame, i);
+ blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byindex(blame, (uint32_t)i);
}
}
shift_hunks_by(&blame->hunks, shift_base, -1);
diff --git a/src/blame_git.c b/src/blame_git.c
index 84ffa29..800f1f0 100644
--- a/src/blame_git.c
+++ b/src/blame_git.c
@@ -324,7 +324,7 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
long trimmed = 0, recovered = 0;
char *ap = a->ptr + a->size;
char *bp = b->ptr + b->size;
- long smaller = (a->size < b->size) ? a->size : b->size;
+ long smaller = (long)((a->size < b->size) ? a->size : b->size);
if (ctx)
return;