projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion for proper Huffman merge pattern: 0 == 1 modulo 1.
[pspp]
/
src
/
var-labs.c
diff --git
a/src/var-labs.c
b/src/var-labs.c
index ee9f4b786d763f6a5b65f2664a7099b7b0b680c9..7d78027ed78011bb54bb3de332ba512502ac2449 100644
(file)
--- a/
src/var-labs.c
+++ b/
src/var-labs.c
@@
-29,10
+29,6
@@
#include "debug-print.h"
#include "debug-print.h"
-#if DEBUGGING
-static void debug_print (void);
-#endif
-
int
cmd_variable_labels (void)
{
int
cmd_variable_labels (void)
{
@@
-41,10
+37,10
@@
cmd_variable_labels (void)
int i;
int i;
- lex_match ('/');
do
{
do
{
- parse_variables (default_dict, &v, &nv, PV_NONE);
+ if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ return CMD_PART_SUCCESS_MAYBE;
if (token != T_STRING)
{
if (token != T_STRING)
{
@@
-52,16
+48,16
@@
cmd_variable_labels (void)
free (v);
return CMD_PART_SUCCESS_MAYBE;
}
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);
}
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 ();
}
lex_get ();
@@
-70,27
+66,16
@@
cmd_variable_labels (void)
free (v);
}
while (token != '.');
free (v);
}
while (token != '.');
-#if 0 && DEBUGGING
- debug_print ();
-#endif
return CMD_SUCCESS;
}
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 */