X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=b5c9e56cdccc7435b31659f33e537c53e4b6268d;hb=f05f98b6b0b7e81f77657a4313fccc259eb5c506;hp=87ba02bbff22fdbdf09119d73a1c8a54d83371c8;hpb=338fb2a2e84df6427a2fdee6769421f57d5666d8;p=pspp-builds.git

diff --git a/src/math/group.c b/src/math/group.c
index 87ba02bb..b5c9e56c 100644
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -1,25 +1,21 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
-   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/hash.h>
 #include "group.h"
@@ -28,46 +24,50 @@
 #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 
+/* 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)
+int
+compare_group (const void *a_,
+		 const void *b_,
+		 const void *var)
 {
-  return compare_values(&a->id, &b->id, width);
+  const struct group_statistics *a = a_;
+  const struct group_statistics *b = b_;
+  return compare_values_short (&a->id, &b->id, var);
 }
 
 
 
-unsigned 
-hash_group(const struct group_statistics *g, int width)
+unsigned int
+hash_group (const void *g_, const void *var)
 {
   unsigned id_hash;
+  const struct group_statistics *g = g_;;
 
-  id_hash = hash_value(&g->id, width);
+  id_hash = hash_value_short (&g->id, var);
 
   return id_hash;
 }
 
 
-void  
-free_group(struct group_statistics *v, void *aux UNUSED)
+void
+free_group (struct group_statistics *v, void *aux UNUSED)
 {
   free(v);
 }
 
 
 struct group_proc *
-group_proc_get (struct variable *v)
+group_proc_get (const struct variable *v)
 {
   /* This is not ideal, obviously. */
   struct group_proc *group = var_get_aux (v);
-  if (group == NULL) 
+  if (group == NULL)
     {
       group = xmalloc (sizeof (struct group_proc));
-      var_attach_aux (v, group, var_dtor_free); 
+      var_attach_aux (v, group, var_dtor_free);
     }
   return group;
 }