diff options
| author |  Salvador Cuñat <salvador.cunat@gmail.com> | 2017-05-07 11:44:47 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-07 07:48:12 -0700 |
| commit | 618cd3fab42995c8adf2dc0daf550f374794309d (patch) | |
| tree | 9904a708b504deccabe83a879537c9407a44d222 /core/datatrak.h | |
| parent | ceb54e6e9e2209d696f37ae958ac5ebf879e895a (diff) | |
| download | subsurface-618cd3fab42995c8adf2dc0daf550f374794309d.tar.gz | |
Datatrak import rework: modify parsing macros
Change how parsing macros work to use memory pointers instead of file
descriptors.
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Diffstat (limited to 'core/datatrak.h')
| -rw-r--r-- | core/datatrak.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/core/datatrak.h b/core/datatrak.h index c207e3baf..7f79237ef 100644 --- a/core/datatrak.h +++ b/core/datatrak.h @@ -48,29 +48,22 @@ extern struct sample *add_sample(struct sample *sample, int time, struct divecom #define read_bytes(_n) \ switch (_n) { \ case 1: \ - if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \ - goto bail; \ - tmp_1byte = lector_bytes[0]; \ + tmp_1byte = membuf[0]; \ break; \ case 2: \ - if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \ - goto bail; \ - tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]); \ + tmp_2bytes = two_bytes_to_int (membuf[1], membuf[0]); \ break; \ default: \ - if (fread (&lector_word, sizeof(char), _n, archivo) != _n) \ - goto bail; \ - tmp_4bytes = four_bytes_to_long(lector_word[3], lector_word[2], lector_word[1], lector_word[0]); \ + tmp_4bytes = four_bytes_to_long(membuf[3], membuf[2], membuf[1], membuf[0]); \ break; \ - } + } \ + JUMP(membuf, _n); #define read_string(_property) \ unsigned char *_property##tmp = (unsigned char *)calloc(tmp_1byte + 1, 1); \ - if (fread((char *)_property##tmp, 1, tmp_1byte, archivo) != tmp_1byte) { \ - free(_property##tmp); \ - goto bail; \ - } \ + _property##tmp = memcpy(_property##tmp, membuf, tmp_1byte);\ _property = (unsigned char *)strcat(to_utf8(_property##tmp), ""); \ - free(_property##tmp); + free(_property##tmp);\ + JUMP(membuf, tmp_1byte); #endif // DATATRAK_HEADER_H |