projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed "Written by" line
[pspp-builds.git]
/
src
/
math
/
group.c
diff --git
a/src/math/group.c
b/src/math/group.c
index 07803183fee58e04679e0ffe51dcba82a054e8c8..105b643a1cf416c6a3eedf17ae08b04cc185d1f5 100644
(file)
--- a/
src/math/group.c
+++ b/
src/math/group.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-19,14
+18,14
@@
#include <config.h>
#include <stdlib.h>
#include <config.h>
#include <stdlib.h>
-#include
"alloc.h"
-#include
"compiler.h"
-#include
"hash.h"
+#include
<libpspp/alloc.h>
+#include
<libpspp/compiler.h>
+#include
<libpspp/hash.h>
#include "group.h"
#include "group-proc.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
@@
-60,10
+59,14
@@
free_group(struct group_statistics *v, void *aux UNUSED)
struct group_proc *
struct group_proc *
-group_proc_get (struct variable *v)
+group_proc_get (
const
struct variable *v)
{
/* This is not ideal, obviously. */
{
/* 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;
}
}