diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-14 15:18:48 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-02-15 01:11:14 -0800 |
| commit | c6da79e1b0157aa286ce65c41b491fbf43f6731e (patch) | |
| tree | 8b912318429da2c74acdde2096f43fe44daa9ab3 /save-xml.c | |
| parent | b4c2fcc802d88fb8721d245e682c99a0237784a0 (diff) | |
| download | subsurface-c6da79e1b0157aa286ce65c41b491fbf43f6731e.tar.gz | |
Improve the code handling air temperature
Better helper functions make for easier to understand code.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'save-xml.c')
| -rw-r--r-- | save-xml.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/save-xml.c b/save-xml.c index c0af41c4c..b3bf9701d 100644 --- a/save-xml.c +++ b/save-xml.c @@ -152,17 +152,14 @@ static void save_depths(FILE *f, struct divecomputer *dc) static void save_dive_temperature(FILE *f, struct dive *dive) { - temperature_t temp; - temp.mkelvin = dive->airtemp.mkelvin; - dive->airtemp.mkelvin = 0; - fixup_airtemp(dive); - if (dive->airtemp.mkelvin && temp.mkelvin != dive->airtemp.mkelvin) { - fputs(" <divetemperature", f); - show_temperature(f, temp, " air='", "'"); - fputs(" />\n", f); - } - dive->airtemp.mkelvin = temp.mkelvin; + if (!dive->airtemp.mkelvin) + return; + if (dive->airtemp.mkelvin == dc_airtemp(&dive->dc)) + return; + fputs(" <divetemperature", f); + show_temperature(f, dive->airtemp, " air='", "'"); + fputs("/>\n", f); } static void save_temperatures(FILE *f, struct divecomputer *dc) |