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

Cleanup liquivision.c

Browse source 
strndup doesn't exist on Windows.
Mark / remove unused variables.
Plus codying style cleanup.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-11-07 21:08:54 -08:00
parent 0a27978014
commit dbc7dbb074
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
liquivision.c
View file

@ -12,9 +12,23 @@
+ ((p)[1]<<8) + ((p)[2]<<16) \ + ((p)[1]<<8) + ((p)[2]<<16) \
+ ((p)[3]<<24)) + ((p)[3]<<24))
#if __WIN32__
static char *strndup (const char *s, size_t n)
{
char *cpy;
size_t len = strlen(s);
if (n < len)
len = n;
if ((cpy = malloc(len + 1)) != NULL) {
cpy[len] = '\0';
memcpy(cpy, s, len);
}
return cpy;
}
#endif
static void static void parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size)
parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) { {
unsigned int ptr = 0; unsigned int ptr = 0;
unsigned char model; unsigned char model;
@ -142,6 +156,11 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
algorithm = *(buf + ptr++); // 0=ZH-L16C+GF algorithm = *(buf + ptr++); // 0=ZH-L16C+GF
sample_count = array_uint32_le(buf + ptr); sample_count = array_uint32_le(buf + ptr);
} }
// we aren't using the start_cns, dive_mode, and algorithm, yet
(void)start_cns;
(void)dive_mode;
(void)algorithm;
ptr += 4; ptr += 4;
// Parse dive samples // Parse dive samples
@ -206,7 +225,7 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
continue; continue;
} }
int sample_time, next_time, last_time; int sample_time, last_time;
int depth_mm, last_depth, temp_mk, last_temp; int depth_mm, last_depth, temp_mk, last_temp;
while (true) { while (true) {
@ -216,7 +235,6 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
sample_time = d * sample_interval; sample_time = d * sample_interval;
depth_mm = array_uint16_le(ds + d * 2) * 10; // cm->mm depth_mm = array_uint16_le(ds + d * 2) * 10; // cm->mm
temp_mk = C_to_mkelvin((float)array_uint16_le(ts + d * 2) / 10); // dC->mK temp_mk = C_to_mkelvin((float)array_uint16_le(ts + d * 2) / 10); // dC->mK
next_time = (d < sample_count - 1 ? (d + 1) * sample_interval : sample_time);
last_time = (d ? (d - 1) * sample_interval : 0); last_time = (d ? (d - 1) * sample_interval : 0);
if (d == sample_count) { if (d == sample_count) {
@ -317,9 +335,7 @@ parse_dives (int log_version, const unsigned char *buf, unsigned int buf_size) {
save_dives("/tmp/test.xml"); save_dives("/tmp/test.xml");
} }
int try_to_open_liquivision(const char *filename, struct memblock *mem)
int
try_to_open_liquivision(const char *filename, struct memblock *mem)
{ {
void *name; void *name;
const unsigned char *buf = mem->buffer; const unsigned char *buf = mem->buffer;