Update all #include directives to the currently preferred style.

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

diff --git a/src/math/group.c b/src/math/group.c
index 58d5c9295d377c0f7d3eaff7877a363f91c103fa..6f86f87d61659800343a38ba090bf8d6472ddbe3 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -1,68 +1,58 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2009, 2011 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <stdlib.h>
-#include "alloc.h"
-#include "hash.h"
-#include "group.h"
-#include "group-proc.h"
-#include "str.h"
-#include "variable.h"
-#include "misc.h"
 
+#include "math/group.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)
-{
-  return compare_values(&a->id, &b->id, width);
-}
+#include <stdlib.h>
 
+#include "data/variable.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/group-proc.h"
 
+#include "gl/xalloc.h"
 
-unsigned 
-hash_group(const struct group_statistics *g, int width)
+void
+free_group (struct group_statistics *v, void *aux UNUSED)
 {
-  unsigned id_hash;
-
-  id_hash = hash_value(&g->id, width);
-
-  return id_hash;
+  free(v);
 }
 
-
-void  
-free_group(struct group_statistics *v, void *aux UNUSED)
+static void
+group_proc_dtor (struct variable *var)
 {
-  free(v);
-}
+  struct group_proc *group = var_detach_aux (var);
 
+  hsh_destroy (group->group_hash);
+  free (group);
+}
 
 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 = xzalloc (sizeof *group);
+      var_attach_aux (v, group, group_proc_dtor);
+    }
+  return group;
 }