Adopt use of gnulib for portability.

[pspp-builds.git] / src / var-labs.c

diff --git a/src/var-labs.c b/src/var-labs.c
index a098e62a88515182162476c51b96e8e467e13f99..65da79082bbeefea8e44e7291eb13ee601fcc0ce 100644 (file)
--- a/src/var-labs.c
+++ b/src/var-labs.c
@@ -14,8 +14,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <stdio.h>
@@ -27,11 +27,10 @@
 #include "str.h"
 #include "var.h"
 
-#include "debug-print.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
-#if DEBUGGING
-static void debug_print (void);
-#endif
+#include "debug-print.h"
 
 int
 cmd_variable_labels (void)
@@ -52,16 +51,16 @@ cmd_variable_labels (void)
          free (v);
          return CMD_PART_SUCCESS_MAYBE;
        }
-      if (ds_length (&tokstr) > 120)
+      if (ds_length (&tokstr) > 255)
        {
-         msg (SW, _("Truncating variable label to 120 characters."));
-         ds_truncate (&tokstr, 120);
+         msg (SW, _("Truncating variable label to 255 characters."));
+         ds_truncate (&tokstr, 255);
        }
       for (i = 0; i < nv; i++)
        {
          if (v[i]->label)
            free (v[i]->label);
-         v[i]->label = xstrdup (ds_value (&tokstr));
+         v[i]->label = xstrdup (ds_c_str (&tokstr));
        }
 
       lex_get ();
@@ -70,27 +69,16 @@ cmd_variable_labels (void)
       free (v);
     }
   while (token != '.');
-#if 0 && DEBUGGING
-  debug_print ();
-#endif
   return CMD_SUCCESS;
 }
 
-#if 0 && DEBUGGING
-static void
-debug_print (void)
+
+
+const char *
+var_to_string(const struct variable *var)
 {
-  int i;
+  if ( !var ) 
+    return 0;
 
-  printf (_("Variable labels:\n"));
-  for (i = 0; i < nvar; i++)
-    {
-      printf ("  %8s: ", var[i]->name);
-      if (var[i]->label)
-       printf ("`%s'", var[i]->label);
-      else
-       printf (_("(no variable label)"));
-      printf ("\n");
-    }
+  return ( var->label ? var->label : var->name);
 }
-#endif /* DEBUGGING */