projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
language
/
dictionary
/
mrsets.c
diff --git
a/src/language/dictionary/mrsets.c
b/src/language/dictionary/mrsets.c
index 621cdc884b1e2fff1eaa256a30314243e242f201..9e1ca3b0d0bc72f330cbad2532639b3e546ca5cd 100644
(file)
--- a/
src/language/dictionary/mrsets.c
+++ b/
src/language/dictionary/mrsets.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011
, 2012
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
@@
-205,14
+205,12
@@
parse_group (struct lexer *lexer, struct dictionary *dict,
if (mrset->name == NULL)
{
if (mrset->name == NULL)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "NAME", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "NAME");
goto error;
}
else if (mrset->n_vars == 0)
{
goto error;
}
else if (mrset->n_vars == 0)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "VARIABLES", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "VARIABLES");
goto error;
}
goto error;
}
@@
-221,8
+219,7
@@
parse_group (struct lexer *lexer, struct dictionary *dict,
/* Check that VALUE is specified and is valid for the VARIABLES. */
if (!has_value)
{
/* Check that VALUE is specified and is valid for the VARIABLES. */
if (!has_value)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "VALUE", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "VALUE");
goto error;
}
else if (var_is_alpha (mrset->vars[0]))
goto error;
}
else if (var_is_alpha (mrset->vars[0]))
@@
-420,7
+417,7
@@
parse_group (struct lexer *lexer, struct dictionary *dict,
if (width == c->width
&& value_equal (value, &c->value, width))
{
if (width == c->width
&& value_equal (value, &c->value, width))
{
- if (!c->warned && strcasecmp (c->label, label))
+ if (!c->warned &&
utf8_
strcasecmp (c->label, label))
{
char *s = data_out (value, var_get_encoding (var),
var_get_print_format (var));
{
char *s = data_out (value, var_get_encoding (var),
var_get_print_format (var));