projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the value_cnt associated with the caseordering
[pspp-builds.git]
/
src
/
data
/
case-ordering.c
diff --git
a/src/data/case-ordering.c
b/src/data/case-ordering.c
index 7b3948c441e0658914a3737ae33071f8b0c2a910..c4a716e079e81eb42a0d6ab4bf703da5988ca2cc 100644
(file)
--- a/
src/data/case-ordering.c
+++ b/
src/data/case-ordering.c
@@
-37,8
+37,6
@@
struct sort_key
/* A set of criteria for ordering cases. */
struct case_ordering
{
/* A set of criteria for ordering cases. */
struct case_ordering
{
- size_t value_cnt; /* Number of `union value's per case. */
-
/* Sort keys. */
struct sort_key *keys;
size_t key_cnt;
/* Sort keys. */
struct sort_key *keys;
size_t key_cnt;
@@
-49,10
+47,9
@@
struct case_ordering
contains no variables, so that all cases will compare as
equal. */
struct case_ordering *
contains no variables, so that all cases will compare as
equal. */
struct case_ordering *
-case_ordering_create (
const struct dictionary *dict
)
+case_ordering_create (
void
)
{
struct case_ordering *co = xmalloc (sizeof *co);
{
struct case_ordering *co = xmalloc (sizeof *co);
- co->value_cnt = dict_get_next_value_idx (dict);
co->keys = NULL;
co->key_cnt = 0;
return co;
co->keys = NULL;
co->key_cnt = 0;
return co;
@@
-63,7
+60,6
@@
struct case_ordering *
case_ordering_clone (const struct case_ordering *orig)
{
struct case_ordering *co = xmalloc (sizeof *co);
case_ordering_clone (const struct case_ordering *orig)
{
struct case_ordering *co = xmalloc (sizeof *co);
- co->value_cnt = orig->value_cnt;
co->keys = xmemdup (orig->keys, orig->key_cnt * sizeof *orig->keys);
co->key_cnt = orig->key_cnt;
return co;
co->keys = xmemdup (orig->keys, orig->key_cnt * sizeof *orig->keys);
co->key_cnt = orig->key_cnt;
return co;
@@
-80,15
+76,6
@@
case_ordering_destroy (struct case_ordering *co)
}
}
}
}
-/* Returns the number of `union value's in the cases that case
- ordering CO compares (taken from the dictionary used to
- construct it). */
-size_t
-case_ordering_get_value_cnt (const struct case_ordering *co)
-{
- return co->value_cnt;
-}
-
/* Compares cases A and B given case ordering CO and returns a
strcmp()-type result. */
int
/* Compares cases A and B given case ordering CO and returns a
strcmp()-type result. */
int