mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Datatrak import rework: modify parsing macros

Browse source 
Change how parsing macros work to use memory pointers instead of file
descriptors.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2017-05-07 11:44:47 +02:00 • committed by Dirk Hohndel
parent ceb54e6e9e
commit 618cd3fab4
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/datatrak.h
View file

@ -48,29 +48,22 @@ extern struct sample *add_sample(struct sample *sample, int time, struct divecom
#define read_bytes(_n) \ #define read_bytes(_n) \
switch (_n) { \ switch (_n) { \
case 1: \ case 1: \
if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \ tmp_1byte = membuf[0]; \
goto bail; \
tmp_1byte = lector_bytes[0]; \
break; \ break; \
case 2: \ case 2: \
if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \ tmp_2bytes = two_bytes_to_int (membuf[1], membuf[0]); \
goto bail; \
tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]); \
break; \ break; \
default: \ default: \
if (fread (&lector_word, sizeof(char), _n, archivo) != _n) \ tmp_4bytes = four_bytes_to_long(membuf[3], membuf[2], membuf[1], membuf[0]); \
goto bail; \
tmp_4bytes = four_bytes_to_long(lector_word[3], lector_word[2], lector_word[1], lector_word[0]); \
break; \ break; \
} } \
JUMP(membuf, _n);
#define read_string(_property) \ #define read_string(_property) \
unsigned char *_property##tmp = (unsigned char *)calloc(tmp_1byte + 1, 1); \ unsigned char *_property##tmp = (unsigned char *)calloc(tmp_1byte + 1, 1); \
if (fread((char *)_property##tmp, 1, tmp_1byte, archivo) != tmp_1byte) { \ _property##tmp = memcpy(_property##tmp, membuf, tmp_1byte);\
free(_property##tmp); \
goto bail; \
} \
_property = (unsigned char *)strcat(to_utf8(_property##tmp), ""); \ _property = (unsigned char *)strcat(to_utf8(_property##tmp), ""); \
free(_property##tmp); free(_property##tmp);\
JUMP(membuf, tmp_1byte);
#endif // DATATRAK_HEADER_H #endif // DATATRAK_HEADER_H