treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / ui / gui / var-display.c

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 72b5731ca90e956388b790f23780cf98449bdea1..951d62c0a8785e745d1cd96c8c45e1282152d5b0 100644 (file)
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -1,3 +1,21 @@
+/*
+PSPP - a program for statistical analysis.
+Copyright (C) 2017 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 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.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <config.h>
 #include "var-display.h"
 
@@ -16,35 +34,25 @@
 static const gchar none[] = N_("None");
 
 
-const gchar *
-measure_to_string (const struct variable *var, GError **err)
-{
-  const gint measure = var_get_measure (var);
-
-  g_assert (measure < n_MEASURES);
-  return gettext (measures[measure]);
-}
-
-
 gchar *
-missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GError **err)
+missing_values_to_string (const struct variable *pv, GError **err)
 {
-  gchar *s;
   const struct missing_values *miss = var_get_missing_values (pv);
-  if ( mv_is_empty (miss))
+  if (mv_is_empty (miss))
     return xstrdup (gettext (none));
   else
     {
-      if ( ! mv_has_range (miss))
+      gchar *s = NULL;
+      if (! mv_has_range (miss))
        {
          GString *gstr = g_string_sized_new (10);
          const int n = mv_n_values (miss);
          gchar *mv[4] = {0,0,0,0};
          gint i;
-         for (i = 0 ; i < n; ++i )
+         for (i = 0 ; i < n; ++i)
            {
              mv[i] = value_to_text (*mv_get_value (miss, i), pv);
-             if ( i > 0 )
+             if (i > 0)
                g_string_append (gstr, ", ");
              g_string_append (gstr, mv[i]);
              g_free (mv[i]);
@@ -66,7 +74,7 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
          g_free (l);
          g_free (h);
 
-         if ( mv_has_value (miss))
+         if (mv_has_value (miss))
            {
              gchar *ss = NULL;