X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=3a483671fbb6bca1561943554f9a52517469b56b;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=29c5ab23db4b7bde28a7c7f2657dba7ede4e8533;hpb=48913a68e4a84276ae421aeb108a3782c95946f8;p=pspp-builds.git

diff --git a/src/math/group.c b/src/math/group.c
index 29c5ab23..3a483671 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 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
@@ -29,21 +29,24 @@
 /* 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)
+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 value_compare_3way (&a->id, &b->id, var_get_width (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 = value_hash (&g->id, var_get_width (var), 0);
 
   return id_hash;
 }