X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Ffreq.c;h=952857479aed75f9f7e27e37b919fa383b70b0fb;hb=9a331fe64eb814ae5c1322e21717a04fb254bf65;hp=9ecc379027d7b680314b38acc43e513418cf366f;hpb=08e4a9535a7e1de9cc4b6e619e70805ab951b323;p=pspp-builds.git

diff --git a/src/language/stats/freq.c b/src/language/stats/freq.c
index 9ecc3790..95285747 100644
--- a/src/language/stats/freq.c
+++ b/src/language/stats/freq.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 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
-   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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <data/variable.h>
@@ -26,27 +23,26 @@
 
 #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  compare_values_short (f1->value, f2->value, 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 hash_value_short (f->value, var);
 }
 
 /* Free function to be used on FR whose value parameter has been copied */
-void 
+void
 free_freq_mutable_hash (void *fr, const void *var UNUSED)
 {
   struct freq_mutable *freq = fr;
@@ -54,7 +50,7 @@ free_freq_mutable_hash (void *fr, const void *var UNUSED)
   free (freq);
 }
 
-void 
+void
 free_freq_hash (void *fr, const void *var UNUSED)
 {
   free (fr);