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: turn struct dive string data into std::string

Browse source 
Much easier memory management!

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-29 20:40:18 +02:00 • committed by bstoeger
parent 2b3d2f1020
commit 3cb04d230b
34 changed files with 208 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/uemis-downloader.cpp
View file

@ -158,20 +158,15 @@ static void uemis_get_index(std::string_view buffer, int &idx)
}
/* space separated */
static void uemis_add_string(std::string_view buffer, char **text, const char *delimit)
static void uemis_add_string(std::string_view buffer, std::string &text, const char *delimit)
{
/* do nothing if this is an empty buffer (Uemis sometimes returns a single
* space for empty buffers) */
if (buffer.empty() || buffer == " ")
return;
if (!*text) {
*text = strdup(std::string(buffer).c_str());
} else {
std::string res = std::string(*text) + delimit;
res += buffer;
free(*text);
*text = strdup(res.c_str());
}
if (!text.empty())
text += delimit;
text += buffer;
}
/* still unclear if it ever reports lbs */
@ -749,24 +744,24 @@ static void parse_tag(struct dive *dive, std::string_view tag, std::string_view
uemis_get_weight(val, ws, dive->dcs[0].diveid);
dive->weightsystems.push_back(std::move(ws));
} else if (tag == "notes") {
uemis_add_string(val, &dive->notes, " ");
uemis_add_string(val, dive->notes, " ");
} else if (tag == "u8DiveSuit") {
int idx = 0;
uemis_get_index(val, idx);
if (idx > 0 && idx < (int)std::size(suit))
uemis_add_string(translate("gettextFromC", suit[idx]), &dive->suit, " ");
uemis_add_string(translate("gettextFromC", suit[idx]), dive->suit, " ");
} else if (tag == "u8DiveSuitType") {
int idx = 0;
uemis_get_index(val, idx);
if (idx > 0 && idx < (int)std::size(suit_type))
uemis_add_string(translate("gettextFromC", suit_type[idx]), &dive->suit, " ");
uemis_add_string(translate("gettextFromC", suit_type[idx]), dive->suit, " ");
} else if (tag == "u8SuitThickness") {
int idx = 0;
uemis_get_index(val, idx);
if (idx > 0 && idx < (int)std::size(suit_thickness))
uemis_add_string(translate("gettextFromC", suit_thickness[idx]), &dive->suit, " ");
uemis_add_string(translate("gettextFromC", suit_thickness[idx]), dive->suit, " ");
} else if (tag == "nickname") {
uemis_add_string(val, &dive->buddy, ",");
uemis_add_string(val, dive->buddy, ",");
}
}