X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvar-labs.c;h=3b5aa83821baa2a7c2d216cef17df629fc69312d;hb=d5fd364b203a2a84e5034b6ff5ac5d6c4412edb7;hp=b573a4e8591ec28dc156a906cd815e162ed3762a;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git

diff --git a/src/var-labs.c b/src/var-labs.c
index b573a4e8..3b5aa838 100644
--- 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,28 +27,23 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
-#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)
 {
-  struct variable **v;
-  int nv;
-
-  int i;
-
-  lex_match_id ("VARIABLE");
-  lex_match_id ("LABELS");
-  lex_match ('/');
   do
     {
-      parse_variables (NULL, &v, &nv, PV_NONE);
+      struct variable **v;
+      size_t nv;
+
+      size_t i;
+
+      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+        return CMD_PART_SUCCESS_MAYBE;
 
       if (token != T_STRING)
 	{
@@ -56,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 ();
@@ -74,27 +69,16 @@ cmd_variable_labels (void)
       free (v);
     }
   while (token != '.');
-#if DEBUGGING
-  debug_print ();
-#endif
   return CMD_SUCCESS;
 }
 
-#if 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 */