Rename compare_values, hash_values with "_short" suffix.

[pspp-builds.git] / src / math / group.c

diff --git a/src/math/group.c b/src/math/group.c
index 154e6f882ffd7341693a6590a3932eb990b111ce..b5c9e56cdccc7435b31659f33e537c53e4b6268d 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -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,32 +24,36 @@
 #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)
+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)
+free_group (struct group_statistics *v, void *aux UNUSED)
 {
   free(v);
 }