mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

git: add device-table to git-parser-state

Browse source 
In analogy to the xml-parser add a device-table to git's parser-state.
Currently this is unused. In upcoming commits the git parser will
then be changed to add device nodes in this table instead of the
global device table. The long-term goal being to detach the
parsers from global state and to make dive-import fully undoable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-18 21:58:04 +02:00 • committed by Dirk Hohndel
parent 694776eed1
commit 255f561aff
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/file.c
View file

@ -325,7 +325,7 @@ int parse_file(const char *filename, struct dive_table *table, struct trip_table
return -1;
}
if (git)
return git_load_dives(git, branch, table, trips, sites, filter_presets);
return git_load_dives(git, branch, table, trips, sites, devices, filter_presets);
if ((ret = readfile(filename, &mem)) < 0) {
/* we don't want to display an error if this was the default file */