X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffreq.c;h=1a0ecd498636561b9fb225f96baa8d9bdc82e409;hb=8b71948cd57dbd2787cb4c50525b957e9be8a62b;hp=f5db0fecda3bdeff08a1be0cacd7ff8235c86e08;hpb=d7d263511bd18042408c40d5536c20c59988ee15;p=pspp
diff --git a/src/language/stats/freq.c b/src/language/stats/freq.c
index f5db0fecda..1a0ecd4986 100644
--- a/src/language/stats/freq.c
+++ b/src/language/stats/freq.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2006, 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 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 . */
#include
#include
@@ -25,35 +23,35 @@
#include "freq.h"
-int
+int
compare_freq ( const void *_f1, const void *_f2, const void *_var)
{
const struct freq *f1 = _f1;
const struct freq *f2 = _f2;
const struct variable *var = _var;
- return compare_values (f1->value, f2->value, var_get_width (var) );
+ return value_compare_3way (&f1->value, &f2->value, var_get_width (var));
}
unsigned int
-hash_freq (const void *_f, const void *_var)
+hash_freq (const void *_f, const void *var)
{
const struct freq *f = _f;
- const struct variable *var = _var;
- return hash_value (f->value, var_get_width (var));
+ return value_hash (&f->value, var_get_width (var), 0);
}
/* Free function to be used on FR whose value parameter has been copied */
-void
-free_freq_mutable_hash (void *fr, const void *var UNUSED)
+void
+free_freq_mutable_hash (void *fr, const void *var_)
{
+ const struct variable *var = var_;
struct freq_mutable *freq = fr;
- free (freq->value);
+ value_destroy (&freq->value, var_get_width (var));
free (freq);
}
-void
+void
free_freq_hash (void *fr, const void *var UNUSED)
{
free (fr);