diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2015-03-11 00:23:14 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-03-11 07:38:22 -0700 |
| commit | 2a1a868db20f2fea08f946cf3733d6deeb61b066 (patch) | |
| tree | 00e9de2c21cce3eaefcead7c3d8c45e9d2c1cc23 /datatrak.h | |
| parent | 76ce2b095bbad46b4804dd075bee22085c606543 (diff) | |
| download | subsurface-2a1a868db20f2fea08f946cf3733d6deeb61b066.tar.gz | |
datatrak: some codings style fixes and fopen() usage
- subsurface_fopen() is needed
- translated one puts("") message
- sizeof(unsigned char | char) is always 1
- pointer symbol (*) location
- padding fixes
- braces fixes
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'datatrak.h')
| -rw-r--r-- | datatrak.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/datatrak.h b/datatrak.h index b3b244fe8..a86a6af0a 100644 --- a/datatrak.h +++ b/datatrak.h @@ -4,31 +4,31 @@ #include <string.h> typedef struct dtrakheader_ { - int header; //Must be 0xA100; + int header; //Must be 0xA100; int divesNum; int dc_serial_1; int dc_serial_2; } dtrakheader; #define read_bytes(_n) \ - switch (_n) {\ - case 1:\ - fread (&lector_bytes, sizeof(char), _n, archivo);\ - tmp_1byte = lector_bytes[0];\ - break;\ - case 2:\ - fread (&lector_bytes, sizeof(char), _n, archivo);\ - tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]);\ - break;\ - default:\ - fread (&lector_word, sizeof(char), _n, archivo);\ - tmp_4bytes = four_bytes_to_long (lector_word[3],lector_word[2],lector_word[1],lector_word[0]);\ - break;\ + switch (_n) { \ + case 1: \ + fread (&lector_bytes, sizeof(char), _n, archivo); \ + tmp_1byte = lector_bytes[0]; \ + break; \ + case 2: \ + fread (&lector_bytes, sizeof(char), _n, archivo); \ + tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]); \ + break; \ + default: \ + fread (&lector_word, sizeof(char), _n, archivo); \ + tmp_4bytes = four_bytes_to_long(lector_word[3], lector_word[2], lector_word[1], lector_word[0]); \ + break; \ } -#define read_string(_property)\ - _property = (unsigned char *) calloc((tmp_1byte + 1), sizeof(unsigned char));\ - fread (_property, sizeof(unsigned char), tmp_1byte, archivo);\ - _property = strcat(to_utf8(_property), "");\ +#define read_string(_property) \ + _property = (unsigned char *)calloc(tmp_1byte + 1, 1); \ + fread(_property, 1, tmp_1byte, archivo); \ + _property = strcat(to_utf8(_property), ""); #endif // DATATRAK_HEADER_H |