projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ea4dbf95c365599cc6192390750dd9098c43e897..6f86f87d61659800343a38ba090bf8d6472ddbe3 100644
(file)
--- a/
src/math/group.c
+++ b/
src/math/group.c
@@
-15,16
+15,19
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
+#include "math/group.h"
+
#include <stdlib.h>
#include <stdlib.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
-#include "group.h"
-#include "group-proc.h"
-#include <libpspp/str.h>
-#include <data/variable.h>
-#include <libpspp/misc.h>
-#include "xalloc.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"
void
free_group (struct group_statistics *v, void *aux UNUSED)
void
free_group (struct group_statistics *v, void *aux UNUSED)
@@
-32,6
+35,14
@@
free_group (struct group_statistics *v, void *aux UNUSED)
free(v);
}
free(v);
}
+static void
+group_proc_dtor (struct variable *var)
+{
+ struct group_proc *group = var_detach_aux (var);
+
+ hsh_destroy (group->group_hash);
+ free (group);
+}
struct group_proc *
group_proc_get (const struct variable *v)
struct group_proc *
group_proc_get (const struct variable *v)
@@
-40,8
+51,8
@@
group_proc_get (const struct variable *v)
struct group_proc *group = var_get_aux (v);
if (group == NULL)
{
struct group_proc *group = var_get_aux (v);
if (group == NULL)
{
- group = x
malloc (sizeof (struct group_proc)
);
- var_attach_aux (v, group,
var_dtor_free
);
+ group = x
zalloc (sizeof *group
);
+ var_attach_aux (v, group,
group_proc_dtor
);
}
return group;
}
}
return group;
}