Turn dive depth, temperature and duration into xml attributes

This makes the xml save-file look way nicer: it's both smaller and
better organized.  Using individual xml nodes for random small details
is silly.

The duration even parses exactly the same, because it still ends up
being '.depth.duration' (now it's the 'duration' attribute of the dive
node, it used to be the 'duration' child node of the dive node).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-05 09:39:55 -07:00
parent 5f79a804b9
commit 04c98344b3
2 changed files with 35 additions and 7 deletions

View file

@ -633,6 +633,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
return;
if (MATCH(".meandepth", depth, &dive->meandepth))
return;
if (MATCH(".depth.max", depth, &dive->maxdepth))
return;
if (MATCH(".depth.mean", depth, &dive->meandepth))
return;
if (MATCH(".duration", duration, &dive->duration))
return;
if (MATCH(".divetime", duration, &dive->duration))
@ -645,6 +649,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
return;
if (MATCH(".watertemp", temperature, &dive->watertemp))
return;
if (MATCH(".temperature.air", temperature, &dive->airtemp))
return;
if (MATCH(".temperature.water", temperature, &dive->watertemp))
return;
if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
return;
if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))