proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-06 11:01:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Copy values to avoid strict aliasing warning

Browse Source 
To make this code more resilient to future changes, we'll
explicitly translate the libgit2 structure to the libxdiff
structure.
This commit is contained in:
Russell Belfer 2012-03-05 09:14:56 -08:00 committed by Russell Belfer
parent 16b83019af
commit 8b2bcfbe68
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/diff_output.c
View File

@ -316,6 +316,7 @@ int git_diff_foreach(
git_vector_foreach(&diff->deltas, info.index, delta) { git_vector_foreach(&diff->deltas, info.index, delta) {
git_blob *old_blob = NULL, *new_blob = NULL; git_blob *old_blob = NULL, *new_blob = NULL;
git_map old_data, new_data; git_map old_data, new_data;
mmfile_t old_xdiff_data, new_xdiff_data;
if (delta->status == GIT_DELTA_UNMODIFIED && if (delta->status == GIT_DELTA_UNMODIFIED &&
(diff->opts.flags & GIT_DIFF_INCLUDE_UNMODIFIED) == 0) (diff->opts.flags & GIT_DIFF_INCLUDE_UNMODIFIED) == 0)
@ -418,8 +419,12 @@ int git_diff_foreach(
assert(hunk_cb || line_cb); assert(hunk_cb || line_cb);
info.delta = delta; info.delta = delta;
old_xdiff_data.ptr = old_data.data;
old_xdiff_data.size = old_data.len;
new_xdiff_data.ptr = new_data.data;
new_xdiff_data.size = new_data.len;
xdl_diff((mmfile_t *)&old_data, (mmfile_t *)&new_data, xdl_diff(&old_xdiff_data, &new_xdiff_data,
&xdiff_params, &xdiff_config, &xdiff_callback); &xdiff_params, &xdiff_config, &xdiff_callback);
cleanup: cleanup: