From 3fb80bcaeb5e3d1d5e447ea29e6bcb6ad619647a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= Date: Tue, 15 Jan 2013 23:26:37 +0100 Subject: [PATCH] Clean up null pointer printout in weightsystem description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there's no weightsystem description, as in most imported dives, print a literal "unknown" instead of null pointer or blank. Signed-off-by: Salvador Cuñat Signed-off-by: Dirk Hohndel --- print.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/print.c b/print.c index ac32ba6e2..bd8bd8e73 100644 --- a/print.c +++ b/print.c @@ -286,7 +286,7 @@ static void print_weight_data (struct dive *dive, cairo_t *cr, int maxwidth, int { int decimals,i; double totalweight, systemweight, weightsystemcounter; - const char *unit_weight; + const char *unit_weight, *desc; char buffer[80]; PangoLayout *layout; @@ -310,7 +310,8 @@ static void print_weight_data (struct dive *dive, cairo_t *cr, int maxwidth, int systemweight = get_weight_units(dive->weightsystem[i].weight.grams, &decimals, &unit_weight); if (systemweight != 0){ cairo_move_to(cr, 0, 0); - snprintf(buffer, sizeof(buffer), _("%s"),dive->weightsystem[i].description); + desc = dive->weightsystem[i].description ? : _("unknown"); + snprintf(buffer, sizeof(buffer), _("%s"), desc); pango_layout_set_text(layout, buffer, -1); pango_cairo_show_layout(cr, layout); cairo_move_to(cr,(2 * maxwidth) / (3 * (double) PANGO_SCALE), 0);