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

Read salinity from git objects

Browse source 
Simple oversight on the reading side.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2014-03-09 20:55:29 -07:00 • committed by Dirk Hohndel
parent 4312b155e1
commit 1fc783aed5
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
load-git.c
View file

@ -79,6 +79,11 @@ static pressure_t get_pressure(const char *line)
return p; return p;
} }
static int get_salinity(const char *line)
{
return rint(10*ascii_strtod(line, NULL));
}
static fraction_t get_fraction(const char *line) static fraction_t get_fraction(const char *line)
{ {
fraction_t f; fraction_t f;
@ -494,6 +499,9 @@ static void parse_dc_model(char *line, struct membuffer *str, void *_dc)
static void parse_dc_surfacepressure(char *line, struct membuffer *str, void *_dc) static void parse_dc_surfacepressure(char *line, struct membuffer *str, void *_dc)
{ struct divecomputer *dc = _dc; dc->surface_pressure = get_pressure(line); } { struct divecomputer *dc = _dc; dc->surface_pressure = get_pressure(line); }
static void parse_dc_salinity(char *line, struct membuffer *str, void *_dc)
{ struct divecomputer *dc = _dc; dc->salinity = get_salinity(line); }
static void parse_dc_surfacetime(char *line, struct membuffer *str, void *_dc) static void parse_dc_surfacetime(char *line, struct membuffer *str, void *_dc)
{ struct divecomputer *dc = _dc; dc->surfacetime = get_duration(line); } { struct divecomputer *dc = _dc; dc->surfacetime = get_duration(line); }
@ -647,7 +655,7 @@ struct keyword_action dc_action[] = {
#undef D #undef D
#define D(x) { #x, parse_dc_ ## x } #define D(x) { #x, parse_dc_ ## x }
D(airtemp), D(date), D(deviceid), D(diveid), D(duration), D(airtemp), D(date), D(deviceid), D(diveid), D(duration),
D(event), D(maxdepth), D(meandepth), D(model), D(event), D(maxdepth), D(meandepth), D(model), D(salinity),
D(surfacepressure), D(surfacetime), D(time), D(watertemp), D(surfacepressure), D(surfacetime), D(time), D(watertemp),
}; };