mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: turn string data in struct divecomputer into std::string
Simplifies memory management. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
cc39f709ce
commit
b9a2eff3c9
28 changed files with 114 additions and 147 deletions
|
|
@ -399,10 +399,8 @@ static int dm5_dive(void *param, int, char **data, char **)
|
|||
if (data[4]) {
|
||||
state->cur_dive->dc.deviceid = atoi(data[4]);
|
||||
}
|
||||
// Ugh. dc.model is const char * -> we are not supposed to write into it. This will
|
||||
// change when we convert to std::string.
|
||||
if (data[5])
|
||||
utf8_string(data[5], (char **)&state->cur_dive->dc.model);
|
||||
utf8_string_std(data[5], &state->cur_dive->dc.model);
|
||||
|
||||
if (data[25]) {
|
||||
switch(atoi(data[25])) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue