From c139aa8d51ef63a79cf8eeb809621ad06b72b808 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 1 Sep 2011 17:37:41 -0700 Subject: [PATCH] Clean up save-file output a bit Use the "empty element" form for samples that don't have any events associated with them (and none do, right now). This avoids that annoying "" crud. And output the units in the output helpers, so that you can't forget them even if you try. Signed-off-by: Linus Torvalds --- save-xml.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/save-xml.c b/save-xml.c index f1049f0..9a6c5c1 100644 --- a/save-xml.c +++ b/save-xml.c @@ -18,38 +18,38 @@ static void show_temperature(FILE *f, temperature_t temp, const char *pre, const sign = "-"; mcelsius = - mcelsius; } - fprintf(f, "%s%s%u.%03u%s", pre, sign, FRACTION(mcelsius, 1000), post); + fprintf(f, "%s%s%u.%03u C%s", pre, sign, FRACTION(mcelsius, 1000), post); } } static void show_depth(FILE *f, depth_t depth, const char *pre, const char *post) { if (depth.mm) - fprintf(f, "%s%u.%03u%s", pre, FRACTION(depth.mm, 1000), post); + fprintf(f, "%s%u.%03u m%s", pre, FRACTION(depth.mm, 1000), post); } static void show_duration(FILE *f, duration_t duration, const char *pre, const char *post) { if (duration.seconds) - fprintf(f, "%s%u:%02u%s", pre, FRACTION(duration.seconds, 60), post); + fprintf(f, "%s%u:%02u min%s", pre, FRACTION(duration.seconds, 60), post); } static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const char *post) { if (pressure.mbar) - fprintf(f, "%s%u.%03u%s", pre, FRACTION(pressure.mbar, 1000), post); + fprintf(f, "%s%u.%03u bar%s", pre, FRACTION(pressure.mbar, 1000), post); } static void save_overview(FILE *f, struct dive *dive) { - show_depth(f, dive->maxdepth, " ", " m\n"); - show_depth(f, dive->meandepth, " ", " m\n"); - show_temperature(f, dive->airtemp, " ", " C\n"); - show_temperature(f, dive->watertemp, " ", " C\n"); - show_duration(f, dive->duration, " ", " min\n"); - show_duration(f, dive->surfacetime, " ", " min\n"); - show_pressure(f, dive->beginning_pressure, " ", " bar\n"); - show_pressure(f, dive->end_pressure, " ", " bar\n"); + show_depth(f, dive->maxdepth, " ", "\n"); + show_depth(f, dive->meandepth, " ", "\n"); + show_temperature(f, dive->airtemp, " ", "\n"); + show_temperature(f, dive->watertemp, " ", "\n"); + show_duration(f, dive->duration, " ", "\n"); + show_duration(f, dive->surfacetime, " ", "\n"); + show_pressure(f, dive->beginning_pressure, " ", "\n"); + show_pressure(f, dive->end_pressure, " ", "\n"); } static void save_gasmix(FILE *f, struct dive *dive) @@ -75,11 +75,11 @@ static void save_sample(FILE *f, struct sample *sample) fprintf(f, " time.seconds,60), FRACTION(sample->depth.mm, 1000)); - show_temperature(f, sample->temperature, " temp='", " C'"); - show_pressure(f, sample->tankpressure, " pressure='", " bar'"); + show_temperature(f, sample->temperature, " temp='", "'"); + show_pressure(f, sample->tankpressure, " pressure='", "'"); if (sample->tankindex) fprintf(f, " tankindex='%d'", sample->tankindex); - fprintf(f, ">\n"); + fprintf(f, " />\n"); } static void save_dive(FILE *f, struct dive *dive) -- 2.45.2