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 string data in struct divecomputer into std::string

Browse source 
Simplifies memory management.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-18 17:03:19 +02:00 • committed by bstoeger
parent cc39f709ce
commit b9a2eff3c9
28 changed files with 114 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/import-shearwater.cpp
View file

@ -266,13 +266,13 @@ static int shearwater_dive(void *param, int, char **data, char **)
if (data[10]) {
switch (atoi(data[10])) {
case 2:
state->cur_settings.dc.model = strdup("Shearwater Petrel/Perdix");
state->cur_settings.dc.model = "Shearwater Petrel/Perdix";
break;
case 4:
state->cur_settings.dc.model = strdup("Shearwater Predator");
state->cur_settings.dc.model = "Shearwater Predator";
break;
default:
state->cur_settings.dc.model = strdup("Shearwater import");
state->cur_settings.dc.model = "Shearwater import";
break;
}
}
@ -285,13 +285,13 @@ static int shearwater_dive(void *param, int, char **data, char **)
if (data[10]) {
switch (atoi(data[10])) {
case 2:
state->cur_dive->dc.model = strdup("Shearwater Petrel/Perdix");
state->cur_dive->dc.model = "Shearwater Petrel/Perdix";
break;
case 4:
state->cur_dive->dc.model = strdup("Shearwater Predator");
state->cur_dive->dc.model = "Shearwater Predator";
break;
default:
state->cur_dive->dc.model = strdup("Shearwater import");
state->cur_dive->dc.model = "Shearwater import";
break;
}
}
@ -396,13 +396,13 @@ static int shearwater_cloud_dive(void *param, int, char **data, char **)
if (data[10]) {
switch (atoi(data[10])) {
case 2:
state->cur_settings.dc.model = strdup("Shearwater Petrel/Perdix");
state->cur_settings.dc.model = "Shearwater Petrel/Perdix";
break;
case 4:
state->cur_settings.dc.model = strdup("Shearwater Predator");
state->cur_settings.dc.model = "Shearwater Predator";
break;
default:
state->cur_settings.dc.model = strdup("Shearwater import");
state->cur_settings.dc.model = "Shearwater import";
break;
}
}
@ -415,13 +415,13 @@ static int shearwater_cloud_dive(void *param, int, char **data, char **)
if (data[10]) {
switch (atoi(data[10])) {
case 2:
state->cur_dive->dc.model = strdup("Shearwater Petrel/Perdix");
state->cur_dive->dc.model = "Shearwater Petrel/Perdix";
break;
case 4:
state->cur_dive->dc.model = strdup("Shearwater Predator");
state->cur_dive->dc.model = "Shearwater Predator";
break;
default:
state->cur_dive->dc.model = strdup("Shearwater import");
state->cur_dive->dc.model = "Shearwater import";
break;
}
}