mirror of
https://git.freebsd.org/ports.git
synced 2025-07-14 15:59:18 -04:00
b9845119f3
./helper/cinnabar-helper.c:1464:49: error: no member named 'map' in 'struct oidset'
hashmap_get_size(&track->set.map.map));
~~~~~~~~~~ ^
./helper/cinnabar-helper.c:1712:34: warning: incompatible pointer types passing 'size_t *' (aka 'unsigned int *') to parameter of type 'unsigned long *' [-Wincompatible-pointer-types]
buf = get_commit_buffer(commit, &size);
^~~~~
./commit.h:112:69: note: passing argument to parameter 'size' here
const void *get_commit_buffer(const struct commit *, unsigned long *size);
^
Reported by: pkg-fallout
13 lines
438 B
C
13 lines
438 B
C
https://github.com/glandium/git-cinnabar/commit/cf440d651b37
|
|
|
|
--- helper/cinnabar-helper.c.orig 2018-09-29 22:45:54 UTC
|
|
+++ helper/cinnabar-helper.c
|
|
@@ -1461,7 +1461,7 @@ static void upgrade_files(const struct old_manifest_tr
|
|
goto corrupted;
|
|
}
|
|
display_progress(track->progress,
|
|
- hashmap_get_size(&track->set.map.map));
|
|
+ kh_size(&track->set.set));
|
|
}
|
|
|
|
free_tree_buffer(state.tree_git);
|