X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=fabd4db289b42a46eab8368b35d82fd3ea532bb6;hb=12212dfd8afc14405274703b511c32d362ec0ab5;hp=154e6f882ffd7341693a6590a3932eb990b111ce;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/math/group.c b/src/math/group.c
index 154e6f88..fabd4db2 100644
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -1,5 +1,5 @@
 /* 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
@@ -16,7 +16,6 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include "group.h"
@@ -25,37 +24,23 @@
 #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)
 {
@@ -63,8 +48,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;
 }