diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-04-07 09:08:49 -0700 |
commit | 387dbe510f14ac5590075544431bbedf1e44fb2f (patch) | |
tree | a20b4b7fd4686e5bdb060d015580ea70fa31478c /uemis-downloader.c | |
parent | eba62d3cf138854625ec95b75bdd55a35e5217a0 (diff) | |
parent | 07c08eafac3eccc9b7360011fd9a19904160351c (diff) | |
download | subsurface-387dbe510f14ac5590075544431bbedf1e44fb2f.tar.gz |
Merge branch 'cleanup-from-Qt-branch' of github.com:henrik242/subsurface
Diffstat (limited to 'uemis-downloader.c')
-rw-r--r-- | uemis-downloader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/uemis-downloader.c b/uemis-downloader.c index 9b54b0f3c..c5113d95a 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -731,7 +731,7 @@ static void process_raw_buffer(uint32_t deviceid, char *inbuf, char **max_divenr return; } -static char *get_divenr(char *deviceidstr) +static char *uemis_get_divenr(char *deviceidstr) { uint32_t deviceid, maxdiveid = 0; int i; @@ -789,7 +789,7 @@ static char *do_uemis_download(struct argument_block *args) /* if we have an empty divelist or force it, then we start downloading from the * first dive on the Uemis; otherwise check which was the last dive downloaded */ if (!args->force_download && dive_table.nr > 0) - newmax = get_divenr(deviceid); + newmax = uemis_get_divenr(deviceid); else newmax = strdup("0"); start = atoi(newmax); |