projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
friedman: Fix GCC warning about uninitialized fr.w.
[pspp]
/
src
/
language
/
dictionary
/
variable-label.c
diff --git
a/src/language/dictionary/variable-label.c
b/src/language/dictionary/variable-label.c
index 88b60ad0f4dc624ff33a62480877bbab82a91722..804a4213d1c4ac8967c8ec1f18b4e8e6322c6e66 100644
(file)
--- a/
src/language/dictionary/variable-label.c
+++ b/
src/language/dictionary/variable-label.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-24,10
+24,11
@@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-45,14
+46,13
@@
cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if (
lex_token (lexer) != T_STRING
)
+ if (
!lex_force_string (lexer)
)
{
{
- msg (SE, _("String expected for variable label."));
free (v);
return CMD_FAILURE;
}
free (v);
return CMD_FAILURE;
}
- ds_init_s
tring (&label, lex_tokstr (lexer)
);
+ ds_init_s
ubstring (&label, lex_tokss (lexer)
);
if (ds_length (&label) > 255)
{
msg (SW, _("Truncating variable label to 255 characters."));
if (ds_length (&label) > 255)
{
msg (SW, _("Truncating variable label to 255 characters."));
@@
-63,11
+63,11
@@
cmd_variable_labels (struct lexer *lexer, struct dataset *ds)
ds_destroy (&label);
lex_get (lexer);
ds_destroy (&label);
lex_get (lexer);
- while (lex_token (lexer) ==
'/'
)
+ while (lex_token (lexer) ==
T_SLASH
)
lex_get (lexer);
free (v);
}
lex_get (lexer);
free (v);
}
- while (lex_token (lexer) !=
'.'
);
+ while (lex_token (lexer) !=
T_ENDCMD
);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}