projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reform string library.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
variable-label.c
diff --git
a/src/language/dictionary/variable-label.c
b/src/language/dictionary/variable-label.c
index 6ddb00a5ef6f8443e9b0e166e179af9fd71a329a..dcd607fe05f3fb71eacea8ecc4c02538ede1ab99 100644
(file)
--- a/
src/language/dictionary/variable-label.c
+++ b/
src/language/dictionary/variable-label.c
@@
-18,20
+18,21
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
int
cmd_variable_labels (void)
{
int
cmd_variable_labels (void)
{
@@
-43,13
+44,13
@@
cmd_variable_labels (void)
size_t i;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
size_t i;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
if (token != T_STRING)
{
msg (SE, _("String expected for variable label."));
free (v);
if (token != T_STRING)
{
msg (SE, _("String expected for variable label."));
free (v);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
if (ds_length (&tokstr) > 255)
{
}
if (ds_length (&tokstr) > 255)
{
@@
-60,7
+61,7
@@
cmd_variable_labels (void)
{
if (v[i]->label)
free (v[i]->label);
{
if (v[i]->label)
free (v[i]->label);
- v[i]->label =
xstrdup (ds_c_str (&tokstr)
);
+ v[i]->label =
ds_xstrdup (&tokstr
);
}
lex_get ();
}
lex_get ();