diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-18 21:58:04 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-24 09:51:37 -0700 |
| commit | 255f561afffb26bae5c4de0c5fe2d60effb41103 (patch) | |
| tree | 7b2987886ad228dfabbbde11aaae933dd903e91d /core/load-git.c | |
| parent | 694776eed1f88327237240e122e15b274a87994b (diff) | |
| download | subsurface-255f561afffb26bae5c4de0c5fe2d60effb41103.tar.gz | |
git: add device-table to git-parser-state
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>
Diffstat (limited to 'core/load-git.c')
| -rw-r--r-- | core/load-git.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/load-git.c b/core/load-git.c index bcb311100..dc7a3e8dc 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -47,6 +47,7 @@ struct git_parser_state { struct dive_table *table; struct trip_table *trips; struct dive_site_table *sites; + struct device_table *devices; struct filter_preset_table *filter_presets; int o2pressure_sensor; }; @@ -1879,7 +1880,7 @@ const char *get_sha(git_repository *repo, const char *branch) * or report an error and return 1 if the load failed. */ int git_load_dives(struct git_repository *repo, const char *branch, struct dive_table *table, struct trip_table *trips, - struct dive_site_table *sites, struct filter_preset_table *filter_presets) + struct dive_site_table *sites, struct device_table *devices, struct filter_preset_table *filter_presets) { int ret; struct git_parser_state state = { 0 }; @@ -1887,6 +1888,7 @@ int git_load_dives(struct git_repository *repo, const char *branch, struct dive_ state.table = table; state.trips = trips; state.sites = sites; + state.devices = devices; state.filter_presets = filter_presets; if (repo == dummy_git_repository) |