mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Move subsurface-core to core and qt-mobile to mobile-widgets
Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
2d760a7bff
commit
7be962bfc2
254 changed files with 572 additions and 582 deletions
41
core/datatrak.h
Normal file
41
core/datatrak.h
Normal file
|
@ -0,0 +1,41 @@
|
|||
#ifndef DATATRAK_HEADER_H
|
||||
#define DATATRAK_HEADER_H
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef struct dtrakheader_ {
|
||||
int header; //Must be 0xA100;
|
||||
int divesNum;
|
||||
int dc_serial_1;
|
||||
int dc_serial_2;
|
||||
} dtrakheader;
|
||||
|
||||
#define read_bytes(_n) \
|
||||
switch (_n) { \
|
||||
case 1: \
|
||||
if (fread (&lector_bytes, sizeof(char), _n, archivo) != _n) \
|
||||
goto bail; \
|
||||
tmp_1byte = lector_bytes[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]); \
|
||||
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]); \
|
||||
break; \
|
||||
}
|
||||
|
||||
#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 = (unsigned char *)strcat(to_utf8(_property##tmp), ""); \
|
||||
free(_property##tmp);
|
||||
|
||||
#endif // DATATRAK_HEADER_H
|
Loading…
Add table
Add a link
Reference in a new issue