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/load-git.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/load-git.c')
| -rw-r--r-- | core/load-git.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/load-git.c b/core/load-git.c index 08d9b7765..8417fc2e4 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -164,10 +164,10 @@ static void parse_dive_gps(char *line, struct membuffer *str, void *_dive) dive->dive_site = ds; } else { if (dive_site_has_gps_location(ds) && !same_location(&ds->location, &location)) { - const char *coords = printGPSCoords(&location); + char *coords = printGPSCoords(&location); // we have a dive site that already has GPS coordinates 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); } ds->location = location; } |