diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-24 21:50:01 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-24 21:57:13 -0700 |
| commit | 04593e8ec4bac2606dec54605c72a6a49cc83f9b (patch) | |
| tree | 030da73608ad9bf1653b5018404b3a5514e6c7bd /core/parse-xml.c | |
| parent | 8facd937f86d913d94275abb80bfa4d2b181bbc6 (diff) | |
| download | subsurface-04593e8ec4bac2606dec54605c72a6a49cc83f9b.tar.gz | |
Cleanup: fix printGPSCoords signature and leaks
The printGPSCoords() function returns a copied C-style string. Since
the owndership is transferred to the caller, the correct return type
is "char *" instead of "const char *".
Thus a number of casts when calling free can be removed.
Moreover a number of callers didn't free the string and thus were
leaking memory. Fix them. Ultimately we might want two versions
of the function: one for QString, one for C-style strings.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index c2e2ef937..c118c89cc 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -1201,9 +1201,9 @@ static void gps_in_dive(char *buffer, struct dive *dive, struct parser_state *st fprintf(stderr, "dive site uuid in dive, but gps location (%10.6f/%10.6f) different from dive location (%10.6f/%10.6f)\n", ds->location.lat.udeg / 1000000.0, ds->location.lon.udeg / 1000000.0, location.lat.udeg / 1000000.0, location.lon.udeg / 1000000.0); - const char *coords = printGPSCoords(&location); + char *coords = printGPSCoords(&location); ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords); - free((void *)coords); + free(coords); } else { ds->location = location; } |