commit - 0dbc22715b295b0b4fd65dfdc2ea1cd9c16083a7
commit + d43a8a88c9bf4c379d158fcd241c63af60421a17
blob - 063b75f59617e22294410e617be93d20187bab57
blob + 8ff5d83ef0290ab7606a89942883d4d89faa2ce9
--- lib/worktree.c
+++ lib/worktree.c
char *fileindex_path = NULL;
struct got_fileindex *fileindex = NULL;
FILE *index = NULL;
- struct got_fileindex_diff_dir_cb diff_cb;
+ struct got_fileindex_diff_dir_cb fdiff_cb;
struct diff_dir_cb_arg arg;
fileindex = got_fileindex_alloc();
}
workdir = opendir(worktree->root_path);
- diff_cb.diff_old_new = status_old_new;
- diff_cb.diff_old = status_old;
- diff_cb.diff_new = status_new;
+ fdiff_cb.diff_old_new = status_old_new;
+ fdiff_cb.diff_old = status_old;
+ fdiff_cb.diff_new = status_new;
arg.fileindex = fileindex;
arg.worktree = worktree;
arg.repo = repo;
arg.status_arg = status_arg;
arg.cancel_cb = cancel_cb;
arg.cancel_arg = cancel_arg;
- err = got_fileindex_diff_dir(fileindex, workdir, repo, &diff_cb, &arg);
+ err = got_fileindex_diff_dir(fileindex, workdir, repo, &fdiff_cb, &arg);
done:
if (workdir)
closedir(workdir);