X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffreq.c;h=1a0ecd498636561b9fb225f96baa8d9bdc82e409;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=f2054380b8807fff50107d3a5b8902a484a6e742;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/language/stats/freq.c b/src/language/stats/freq.c
index f2054380..1a0ecd49 100644
--- a/src/language/stats/freq.c
+++ b/src/language/stats/freq.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   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
@@ -30,24 +30,24 @@ compare_freq ( const void *_f1, const void *_f2, const void *_var)
   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)
+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);
 }