diff options
| author |  Salvador Cuñat <salvador.cunat@gmail.com> | 2017-05-07 10:15:59 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-07 07:48:12 -0700 |
| commit | 25cec35d24a89ecf114961acc52415566f332dea (patch) | |
| tree | 39ac30ea25a7698ca002331b7bd116b13bcfe182 /core | |
| parent | 92d24a2912d1e9302b86d74a13a9bc124e7b380c (diff) | |
| download | subsurface-25cec35d24a89ecf114961acc52415566f332dea.tar.gz | |
Datatrak import rework: changes of file.c and file.h
Datatrak import is called from parse_file() in file.c. This function
reads the full file to be imported into a memblock structure. It's
easier and more secure, to parse this buffer instead of the file itself.
These are the necessary changes in function datatrak_import()
declaration and call.
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/file.c | 5 | ||||
| -rw-r--r-- | core/file.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/file.c b/core/file.c index ba2956d60..59d00badb 100644 --- a/core/file.c +++ b/core/file.c @@ -534,8 +534,9 @@ int parse_file(const char *filename) /* DataTrak/Wlog */ if (fmt && !strcasecmp(fmt + 1, "LOG")) { - datatrak_import(filename, &dive_table); - return 0; + ret = datatrak_import(&mem, &dive_table); + free(mem.buffer); + return ret; } /* OSTCtools */ diff --git a/core/file.h b/core/file.h index 8c5647ed2..423d471f9 100644 --- a/core/file.h +++ b/core/file.h @@ -9,7 +9,7 @@ struct memblock { extern int try_to_open_cochran(const char *filename, struct memblock *mem); extern int try_to_open_liquivision(const char *filename, struct memblock *mem); -extern void datatrak_import(const char *file, struct dive_table *table); +extern int datatrak_import(struct memblock *mem, struct dive_table *table); extern void ostctools_import(const char *file, struct dive_table *table); #ifdef __cplusplus |