X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=3a483671fbb6bca1561943554f9a52517469b56b;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=6101c350e483457f372a6f6ca7ae3d1aec16a385;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp-builds.git diff --git a/src/math/group.c b/src/math/group.c index 6101c350..3a483671 100644 --- a/src/math/group.c +++ b/src/math/group.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009 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 @@ -35,7 +35,7 @@ compare_group (const void *a_, { const struct group_statistics *a = a_; const struct group_statistics *b = b_; - return compare_values(&a->id, &b->id, var); + return value_compare_3way (&a->id, &b->id, var_get_width (var)); } @@ -44,9 +44,9 @@ unsigned int hash_group (const void *g_, const void *var) { unsigned id_hash; - const struct group_statistics *g = g_;; + const struct group_statistics *g = g_; - id_hash = hash_value(&g->id, var); + id_hash = value_hash (&g->id, var_get_width (var), 0); return id_hash; }