/* PSPP - computes sample statistics.
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
#include <config.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "hash.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include "group.h"
#include "group-proc.h"
-#include "str.h"
-#include "variable.h"
-#include "misc.h"
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <libpspp/misc.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
+compare_group(const struct group_statistics *a,
+ const struct group_statistics *b,
int width)
{
return compare_values(&a->id, &b->id, width);
-unsigned
+unsigned
hash_group(const struct group_statistics *g, int width)
{
unsigned id_hash;
}
-void
+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. */
- if (v->aux == NULL)
- var_attach_aux (v, xmalloc (sizeof (struct group_proc)), var_dtor_free);
- return v->aux;
+ 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);
+ }
+ return group;
}