/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include "group.h"
#include <data/variable.h>
#include <libpspp/misc.h>
+#include "xalloc.h"
-/* Return -1 if the id of a is less than b; +1 if greater than and
- 0 if equal */
-int
-compare_group(const struct group_statistics *a,
- const struct group_statistics *b,
- int width)
+void
+free_group (struct group_statistics *v, void *aux UNUSED)
{
- return compare_values(&a->id, &b->id, width);
+ free(v);
}
-
-
-unsigned
-hash_group(const struct group_statistics *g, int width)
+static void
+group_proc_dtor (struct variable *var)
{
- unsigned id_hash;
-
- id_hash = hash_value(&g->id, width);
-
- return id_hash;
-}
-
+ struct group_proc *group = var_detach_aux (var);
-void
-free_group(struct group_statistics *v, void *aux UNUSED)
-{
- free(v);
+ hsh_destroy (group->group_hash);
+ free (group);
}
-
struct group_proc *
group_proc_get (const struct variable *v)
{
struct group_proc *group = var_get_aux (v);
if (group == NULL)
{
- group = xmalloc (sizeof (struct group_proc));
- var_attach_aux (v, group, var_dtor_free);
+ group = xzalloc (sizeof *group);
+ var_attach_aux (v, group, group_proc_dtor);
}
return group;
}