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

core: convert git_info to std::string

Browse source 
Quite a bit of fallout in users of this structure.

Conveniently, since git-access.cpp is now C++ we can move
some helpers from the monstrous qthelper.cpp to git-access.cpp.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-11 21:41:14 +01:00 • committed by bstoeger
parent ae299d5e66
commit a123589efb
13 changed files with 290 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/file.cpp
View file

@ -13,6 +13,7 @@
#include "dive.h"
#include "divelog.h"
#include "subsurface-string.h"
#include "format.h"
#include "errorhelper.h"
#include "file.h"
#include "git-access.h"
@ -250,7 +251,7 @@ static int parse_file_buffer(const char *filename, std::string &mem, struct dive
return parse_xml_buffer(filename, mem.data(), mem.size(), log, NULL);
}
extern "C" bool remote_repo_uptodate(const char *filename, struct git_info *info)
bool remote_repo_uptodate(const char *filename, struct git_info *info)
{
std::string current_sha = saved_git_id;
@ -278,14 +279,11 @@ extern "C" int parse_file(const char *filename, struct divelog *log)
* Opening the cloud storage repository failed for some reason
* give up here and don't send errors about git repositories
*/
if (info.is_subsurface_cloud) {
cleanup_git_info(&info);
if (info.is_subsurface_cloud)
return -1;
}
}
int ret = git_load_dives(&info, log);
cleanup_git_info(&info);
return ret;
}