diff options
author | Salvador Cuñat <salvador.cunat@gmail.com> | 2013-01-15 23:26:37 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-01-15 17:37:42 -0800 |
commit | 3fb80bcaeb5e3d1d5e447ea29e6bcb6ad619647a (patch) | |
tree | 90014049c056f442d5aa6fb7eeb4d449f02ebc88 /print.c | |
parent | 348c590ac62a00af565f07163b76293126257b20 (diff) | |
download | subsurface-3fb80bcaeb5e3d1d5e447ea29e6bcb6ad619647a.tar.gz |
Clean up null pointer printout in weightsystem description
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 <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'print.c')
-rw-r--r-- | print.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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); |