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

import: turn C-string in device_data_t into std::strings

Browse source 
It was never clear what was a pointer to a static string from
libdivecomputer and what was allocated.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-02 21:26:22 +02:00 • committed by bstoeger
parent 0915c1ce43
commit 01306224ff
15 changed files with 120 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/libdivecomputer.h
View file

@ -21,10 +21,9 @@
#endif
#ifdef __cplusplus
#include <string>
extern "C" {
#else
#include <stdbool.h>
#endif
struct dive;
struct divelog;
@ -32,8 +31,8 @@ struct devices;
typedef struct {
dc_descriptor_t *descriptor = nullptr;
const char *vendor = nullptr, *product = nullptr, *devname = nullptr;
const char *model = nullptr, *btname = nullptr;
std::string vendor, product, devname;
std::string model, btname;
unsigned char *fingerprint = nullptr;
unsigned int fsize = 0, fdeviceid = 0, fdiveid = 0;
struct dc_event_devinfo_t devinfo = { };
@ -71,13 +70,10 @@ dc_status_t divecomputer_device_open(device_data_t *data);
unsigned int get_supported_transports(device_data_t *data);
#ifdef __cplusplus
}
#include <string>
extern std::string logfile_name;
extern std::string dumpfile_name;
}
#endif
#endif // LIBDIVECOMPUTER_H