projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix header ordering.
[pspp]
/
src
/
language
/
dictionary
/
value-labels.c
diff --git
a/src/language/dictionary/value-labels.c
b/src/language/dictionary/value-labels.c
index 96b80ba735294adad2dd73852c464eed45c3f933..8479fe7fa74218feeb0c462aed2e86fa1c5df692 100644
(file)
--- a/
src/language/dictionary/value-labels.c
+++ b/
src/language/dictionary/value-labels.c
@@
-20,14
+20,14
@@
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
-#include
"alloc.h"
-#include
"command.h"
-#include
"message.h"
-#include
"hash.h"
-#include
"lexer.h"
-#include
"str.h"
-#include
"value-labels.h"
-#include
"variable.h"
+#include
<libpspp/alloc.h>
+#include
<language/command.h>
+#include
<libpspp/message.h>
+#include
<libpspp/hash.h>
+#include
<language/lexer/lexer.h>
+#include
<libpspp/str.h>
+#include
<data/value-labels.h>
+#include
<data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-92,17
+92,14
@@
do_value_labels (int erase)
free (vars);
}
free (vars);
}
- if (token != '.')
- {
- lex_error (NULL);
- return CMD_TRAILING_GARBAGE;
- }
+ if (parse_err)
+ return CMD_FAILURE;
- return
parse_err ? CMD_PART_SUCCESS_MAYBE : CMD_SUCCESS
;
+ return
lex_end_of_command ()
;
lossage:
free (vars);
lossage:
free (vars);
- return CMD_
PART_SUCCESS_MAYB
E;
+ return CMD_
FAILUR
E;
}
/* Verifies that none of the VAR_CNT variables in VARS are long
}
/* Verifies that none of the VAR_CNT variables in VARS are long