| Message ID | 0f69cce6-a0a0-8972-93dd-5c1aa428f508@ramsayjones.plus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | revision.c: fix sparse warnings (sparse algorithm) | expand |
On 1/13/2019 3:55 PM, Ramsay Jones wrote: > Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> > --- > > Hi Derrick, > > If you need to re-roll your 'ds/push-sparse-tree-walk' branch, could > you please squash this into the relevant patch [commit 9949aaeef4 > ("revision: implement sparse algorithm", 2018-12-14)]. > > This commit caused both 'sparse' and my 'static-check.pl' script to > complain about the visibility of the 'map_flags' variable (it is a > file local variable), so one solution would be to mark it 'static'. > However, it is simply not being used, so ... > > Thanks! > > ATB, > Ramsay Jones Thanks, Ramsay! I'm rerolling the series today, so I will make this change. -Stolee
Derrick Stolee <stolee@gmail.com> writes: > On 1/13/2019 3:55 PM, Ramsay Jones wrote: >> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> >> --- >> >> Hi Derrick, >> >> If you need to re-roll your 'ds/push-sparse-tree-walk' branch, could >> you please squash this into the relevant patch [commit 9949aaeef4 >> ("revision: implement sparse algorithm", 2018-12-14)]. >> >> This commit caused both 'sparse' and my 'static-check.pl' script to >> complain about the visibility of the 'map_flags' variable (it is a >> file local variable), so one solution would be to mark it 'static'. >> However, it is simply not being used, so ... >> >> Thanks! >> >> ATB, >> Ramsay Jones > > Thanks, Ramsay! I'm rerolling the series today, so I will make this change. > > -Stolee Thanks, both.
diff --git a/revision.c b/revision.c index a048da3cf5..c4982a70b1 100644 --- a/revision.c +++ b/revision.c @@ -114,10 +114,9 @@ static int path_and_oids_cmp(const void *hashmap_cmp_fn_data, return strcmp(e1->path, e2->path); } -int map_flags = 0; static void paths_and_oids_init(struct hashmap *map) { - hashmap_init(map, (hashmap_cmp_fn) path_and_oids_cmp, &map_flags, 0); + hashmap_init(map, (hashmap_cmp_fn) path_and_oids_cmp, NULL, 0); } static void paths_and_oids_clear(struct hashmap *map)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> --- Hi Derrick, If you need to re-roll your 'ds/push-sparse-tree-walk' branch, could you please squash this into the relevant patch [commit 9949aaeef4 ("revision: implement sparse algorithm", 2018-12-14)]. This commit caused both 'sparse' and my 'static-check.pl' script to complain about the visibility of the 'map_flags' variable (it is a file local variable), so one solution would be to mark it 'static'. However, it is simply not being used, so ... Thanks! ATB, Ramsay Jones revision.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)