X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=6f86f87d61659800343a38ba090bf8d6472ddbe3;hb=refs%2Fbuilds%2F20110511030502%2Fpspp;hp=ea4dbf95c365599cc6192390750dd9098c43e897;hpb=cc2f230e7056734a2f7db67fbf9646a549496021;p=pspp
diff --git a/src/math/group.c b/src/math/group.c
index ea4dbf95c3..6f86f87d61 100644
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -15,16 +15,19 @@
along with this program. If not, see . */
#include
+
+#include "math/group.h"
+
#include
-#include
-#include
-#include "group.h"
-#include "group-proc.h"
-#include
-#include
-#include
-#include "xalloc.h"
+#include "data/variable.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/group-proc.h"
+
+#include "gl/xalloc.h"
void
free_group (struct group_statistics *v, void *aux UNUSED)
@@ -32,6 +35,14 @@ free_group (struct group_statistics *v, void *aux UNUSED)
free(v);
}
+static void
+group_proc_dtor (struct variable *var)
+{
+ struct group_proc *group = var_detach_aux (var);
+
+ hsh_destroy (group->group_hash);
+ free (group);
+}
struct group_proc *
group_proc_get (const struct variable *v)
@@ -40,8 +51,8 @@ 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;
}