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: make logfile_name and dumpfile_name std::string

Browse source 
To avoid memory management woes. These shouldn't be global
variables, but let's fix that later.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-16 10:29:05 +01:00 • committed by bstoeger
parent 64419f2b19
commit 3a1122048b
6 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/libdivecomputer.cpp
View file

@ -38,11 +38,10 @@
#include "core/version.h"
#include "core/qthelper.h"
#include "core/file.h"
#include <QtGlobal>
#include <array>
char *dumpfile_name;
char *logfile_name;
std::string dumpfile_name;
std::string logfile_name;
const char *progress_bar_text = "";
void (*progress_callback)(const char *text) = NULL;
double progress_bar_fraction = 0.0;
@ -1173,8 +1172,8 @@ static const char *do_device_import(device_data_t *data)
dc_buffer_t *buffer = dc_buffer_new(0);
rc = dc_device_dump(device, buffer);
if (rc == DC_STATUS_SUCCESS && dumpfile_name) {
FILE *fp = subsurface_fopen(dumpfile_name, "wb");
if (rc == DC_STATUS_SUCCESS && !dumpfile_name.empty()) {
FILE *fp = subsurface_fopen(dumpfile_name.c_str(), "wb");
if (fp != NULL) {
fwrite(dc_buffer_get_data(buffer), 1, dc_buffer_get_size(buffer), fp);
fclose(fp);
@ -1479,8 +1478,8 @@ const char *do_libdivecomputer_import(device_data_t *data)
data->fingerprint = NULL;
data->fsize = 0;
if (data->libdc_log && logfile_name)
fp = subsurface_fopen(logfile_name, "w");
if (data->libdc_log && !logfile_name.empty())
fp = subsurface_fopen(logfile_name.c_str(), "w");
data->libdc_logfile = fp;