X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcase.c;h=e879f6ac2559fbf84559652796d6acbae69e6705;hb=a49b940e58f148bf111c647d9b4822025636ff80;hp=60704185a6a105b5a5730447c9a018919fc5bac1;hpb=dc331e08118a1c299a41069f6f51183176b27621;p=pspp diff --git a/src/data/case.c b/src/data/case.c index 60704185a6..e879f6ac25 100644 --- a/src/data/case.c +++ b/src/data/case.c @@ -333,8 +333,7 @@ const uint8_t * case_str (const struct ccase *c, const struct variable *v) { assert_variable_matches_case (c, v); - size_t idx = var_get_case_index (v); - return value_str (&c->values[idx], caseproto_get_width (c->proto, idx)); + return c->values[var_get_case_index (v)].s; } /* Returns the string value of the `union value' in C numbered @@ -346,7 +345,7 @@ const uint8_t * case_str_idx (const struct ccase *c, size_t idx) { assert (idx < c->proto->n_widths); - return value_str (&c->values[idx], caseproto_get_width (c->proto, idx)); + return c->values[idx].s; } /* Returns the string value of the `union value' in C for @@ -363,7 +362,7 @@ case_str_rw (struct ccase *c, const struct variable *v) assert_variable_matches_case (c, v); size_t idx = var_get_case_index (v); assert (!case_is_shared (c)); - return value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx)); + return c->values[idx].s; } /* Returns the string value of the `union value' in C numbered @@ -378,7 +377,7 @@ case_str_rw_idx (struct ccase *c, size_t idx) { assert (idx < c->proto->n_widths); assert (!case_is_shared (c)); - return value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx)); + return c->values[idx].s; } /* Compares the values of the N_VARS variables in VP