projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suppress GCC 4.7 warnings by changes to code that make it less clear.
[pspp]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index ff2b030ce0e206f3af47c48f090368027dd60e4c..0502ff9d00042e473d32d50235aedd4d150d35f1 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 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
@@
-362,7
+362,7
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
assert (!in_correct_state (command, state));
if (state == CMD_STATE_INITIAL || state == CMD_STATE_DATA)
{
assert (!in_correct_state (command, state));
if (state == CMD_STATE_INITIAL || state == CMD_STATE_DATA)
{
- switch (command->states)
+ switch (
(int)
command->states)
{
/* One allowed state. */
case S_INITIAL:
{
/* One allowed state. */
case S_INITIAL:
@@
-385,24
+385,23
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
case S_INITIAL | S_DATA:
NOT_REACHED ();
case S_INITIAL | S_INPUT_PROGRAM:
case S_INITIAL | S_DATA:
NOT_REACHED ();
case S_INITIAL | S_INPUT_PROGRAM:
- msg (SE, _("%s is allowed only before the active dataset has
"
-
"been defined or inside INPUT PROGRAM."), command->name
);
+ msg (SE, _("%s is allowed only before the active dataset has
been defined or inside %s."),
+
command->name, "INPUT PROGRAM"
);
break;
case S_INITIAL | S_FILE_TYPE:
break;
case S_INITIAL | S_FILE_TYPE:
- msg (SE, _("%s is allowed only before the active dataset has
"
-
"been defined or inside FILE TYPE."), command->name
);
+ msg (SE, _("%s is allowed only before the active dataset has
been defined or inside %s."),
+
command->name, "FILE TYPE"
);
break;
case S_DATA | S_INPUT_PROGRAM:
break;
case S_DATA | S_INPUT_PROGRAM:
- msg (SE, _("%s is allowed only after the active dataset has
"
-
"been defined or inside INPUT PROGRAM."), command->name
);
+ msg (SE, _("%s is allowed only after the active dataset has
been defined or inside %s."),
+
command->name, "INPUT PROGRAM"
);
break;
case S_DATA | S_FILE_TYPE:
break;
case S_DATA | S_FILE_TYPE:
- msg (SE, _("%s is allowed only after the active dataset has
"
-
"been defined or inside FILE TYPE."), command->name
);
+ msg (SE, _("%s is allowed only after the active dataset has
been defined or inside %s."),
+
command->name, "FILE TYPE"
);
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
- msg (SE, _("%s is allowed only inside INPUT PROGRAM "
- "or inside FILE TYPE."), command->name);
+ msg (SE, _("%s is allowed only inside INPUT PROGRAM or inside FILE TYPE."), command->name);
break;
/* Three allowed states. */
break;
/* Three allowed states. */
@@
-431,7
+430,7
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
}
else if (state == CMD_STATE_INPUT_PROGRAM)
msg (SE, _("%s is not allowed inside %s."),
}
else if (state == CMD_STATE_INPUT_PROGRAM)
msg (SE, _("%s is not allowed inside %s."),
-
command->name, "INPUT PROGRAM" );
+ command->name, "INPUT PROGRAM" );
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");