projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed problems with justification
[pspp]
/
src
/
math
/
group.c
diff --git
a/src/math/group.c
b/src/math/group.c
index 154e6f882ffd7341693a6590a3932eb990b111ce..6101c350e483457f372a6f6ca7ae3d1aec16a385 100644
(file)
--- a/
src/math/group.c
+++ b/
src/math/group.c
@@
-16,7
+16,6
@@
#include <config.h>
#include <stdlib.h>
#include <config.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include "group.h"
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include "group.h"
@@
-25,32
+24,36
@@
#include <data/variable.h>
#include <libpspp/misc.h>
#include <data/variable.h>
#include <libpspp/misc.h>
+#include "xalloc.h"
/* Return -1 if the id of a is less than b; +1 if greater than and
0 if equal */
int
/* 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
)
+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 compare_values(&a->id, &b->id, var);
}
}
-unsigned
-hash_group
(const struct group_statistics *g, int width
)
+unsigned
int
+hash_group
(const void *g_, const void *var
)
{
unsigned id_hash;
{
unsigned id_hash;
+ const struct group_statistics *g = g_;;
- id_hash = hash_value(&g->id,
width
);
+ id_hash = hash_value(&g->id,
var
);
return id_hash;
}
void
return id_hash;
}
void
-free_group(struct group_statistics *v, void *aux UNUSED)
+free_group
(struct group_statistics *v, void *aux UNUSED)
{
free(v);
}
{
free(v);
}