X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcoefficient.c;h=b3dccc518733a8a079d50e9c11a8b65cbdbc00dd;hb=refs%2Fbuilds%2F20100410040506%2Fpspp;hp=1f157433ee21a901eda70718313a2f5edc18c676;hpb=2165f59ab9eee5272b4037e45477811627cae078;p=pspp

diff --git a/src/math/coefficient.c b/src/math/coefficient.c
index 1f157433ee..b3dccc5187 100644
--- a/src/math/coefficient.c
+++ b/src/math/coefficient.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 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
@@ -159,18 +159,16 @@ pspp_coeff_var_to_coeff (const struct variable *v, struct pspp_coeff **coefs,
 {
   size_t i = 0;
   size_t j = 0;
-  size_t v_idx;
 
   struct pspp_coeff *result = NULL;
 
   if (v != NULL)
     {
-      v_idx = var_get_dict_index (v);
       while (i < n_coef)
 	{
 	  if (coefs[i]->v_info != NULL)
 	    {
-	      if (var_get_dict_index (coefs[i]->v_info->v) == v_idx)
+	      if (coefs[i]->v_info->v == v)
 		{
 		  break;
 		}
@@ -185,9 +183,12 @@ pspp_coeff_var_to_coeff (const struct variable *v, struct pspp_coeff **coefs,
 	   */
 	  if (val != NULL)
 	    {
+              int width = var_get_width (v);
+
 	      j = i;
-	      while (j < n_coef && compare_values_short (pspp_coeff_get_value (coefs[j], v),
-                                                         val, v) != 0)
+	      while (j < n_coef
+                     && value_compare_3way (pspp_coeff_get_value (coefs[j], v),
+                                            val, width) != 0)
 		{
 		  j++;
 		}