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

16
core/parse-xml.cpp
View file

@ -1016,8 +1016,8 @@ static int divinglog_dive_match(struct dive *dive, const char *name, char *buf,
MATCH("divetime", duration, &dive->dcs[0].duration) ||
MATCH_STATE("depth", depth, &dive->dcs[0].maxdepth) ||
MATCH_STATE("depthavg", depth, &dive->dcs[0].meandepth) ||
MATCH("comments", utf8_string, &dive->notes) ||
MATCH("names.buddy", utf8_string, &dive->buddy) ||
MATCH("comments", utf8_string_std, &dive->notes) ||
MATCH("names.buddy", utf8_string_std, &dive->buddy) ||
MATCH("name.country", utf8_string_std, &state->country) ||
MATCH("name.city", utf8_string_std, &state->city) ||
MATCH_STATE("name.place", divinglog_place, dive) ||
@ -1309,18 +1309,18 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf, str
return;
if (MATCH_STATE("name.dive", add_dive_site, dive))
return;
if (MATCH("suit", utf8_string, &dive->suit))
if (MATCH("suit", utf8_string_std, &dive->suit))
return;
if (MATCH("divesuit", utf8_string, &dive->suit))
if (MATCH("divesuit", utf8_string_std, &dive->suit))
return;
if (MATCH("notes", utf8_string, &dive->notes))
if (MATCH("notes", utf8_string_std, &dive->notes))
return;
// For historic reasons, we accept dive guide as well as dive master
if (MATCH("diveguide", utf8_string, &dive->diveguide))
if (MATCH("diveguide", utf8_string_std, &dive->diveguide))
return;
if (MATCH("divemaster", utf8_string, &dive->diveguide))
if (MATCH("divemaster", utf8_string_std, &dive->diveguide))
return;
if (MATCH("buddy", utf8_string, &dive->buddy))
if (MATCH("buddy", utf8_string_std, &dive->buddy))
return;
if (MATCH("watersalinity", salinity, &dive->user_salinity))
return;