X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fbarchart.c;h=812a96d03a5b5cec1ca273585acf26fd799136b5;hb=396c757f00279e058d8614315d63bc699eefe3cf;hp=07a39e818f65193b6ddc6ed4816eab19c3a65dd5;hpb=146f03d78d2663350f619fd70b7e68c581575765;p=pspp diff --git a/src/output/charts/barchart.c b/src/output/charts/barchart.c index 07a39e818f..812a96d03a 100644 --- a/src/output/charts/barchart.c +++ b/src/output/charts/barchart.c @@ -136,8 +136,9 @@ barchart_create (const struct variable **var, int n_vars, { struct category *s = xzalloc (sizeof *s); s->idx = idx++; - value_init (&s->val, var_get_width (var[pidx])); - value_copy (&s->val, &src->values[pidx], var_get_width (var[pidx])); + s->width = var_get_width (var[pidx]); + value_init (&s->val, s->width); + value_copy (&s->val, &src->values[pidx], s->width); ds_init_empty (&s->label); var_append_value_name (var[pidx], &s->val, &s->label); @@ -173,7 +174,8 @@ barchart_create (const struct variable **var, int n_vars, { struct category *s = xzalloc (sizeof *s); s->idx = idx++; - value_init (&s->val, var_get_width (var[sidx])); + s->width = var_get_width (var[sidx]); + value_init (&s->val, s->width); value_copy (&s->val, &src->values[sidx], var_get_width (var[sidx])); ds_init_empty (&s->label); var_append_value_name (var[sidx], &s->val, &s->label); @@ -256,6 +258,8 @@ destroy_cat_map (struct hmap *m) struct category *next = NULL; HMAP_FOR_EACH_SAFE (foo, next, struct category, node, m) { + value_destroy (&foo->val, foo->width); + ds_destroy (&foo->label); free (foo); }