X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fgroup.c;h=3a483671fbb6bca1561943554f9a52517469b56b;hb=7a25451afd4c4f33077ed10b248c089e0189f783;hp=3978f2fb948818805c1c9045637ad8e1f2f0f727;hpb=164d1274fcb70c54897f2a03fc7c27152ed4821a;p=pspp-builds.git
diff --git a/src/math/group.c b/src/math/group.c
index 3978f2fb..3a483671 100644
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -1,24 +1,21 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 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 . */
#include
#include
-#include
#include
#include
#include "group.h"
@@ -27,46 +24,50 @@
#include
#include
+#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 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;
}
-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;
}