projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DATASET: Improve error messages and coding style.
[pspp]
/
src
/
ui
/
source-init-opts.c
diff --git
a/src/ui/source-init-opts.c
b/src/ui/source-init-opts.c
index 9627fdf57a5525696f2ba5953b110a0b2f14cf94..c5f5b4d4576934b8a9a315afbd92f7ece59f0b08 100644
(file)
--- a/
src/ui/source-init-opts.c
+++ b/
src/ui/source-init-opts.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2010 Free Software Foundation
+ Copyright (C) 2008, 2010
, 2014
Free Software Foundation
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
@@
-22,10
+22,7
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include "data/file-name.h"
-#include "data/por-file-reader.h"
#include "data/settings.h"
#include "data/settings.h"
-#include "data/sys-file-reader.h"
#include "language/lexer/include-path.h"
#include "language/lexer/lexer.h"
#include "libpspp/assertion.h"
#include "language/lexer/include-path.h"
#include "language/lexer/lexer.h"
#include "libpspp/assertion.h"
@@
-71,10
+68,8
@@
source_init_option_callback (int id, void *aux UNUSED)
else if (!strcmp (optarg, "enhanced"))
settings_set_algorithm (ENHANCED);
else
else if (!strcmp (optarg, "enhanced"))
settings_set_algorithm (ENHANCED);
else
- /* TRANSLATORS: Leave the words `compatible' and `enhanced' in their
- original English. */
error (1, 0,
error (1, 0,
- _("Algorithm must be either `
compatible' or `enhanced'.")
);
+ _("Algorithm must be either `
%s' or `%s'."), "compatible", "enhanced"
);
break;
case OPT_INCLUDE:
break;
case OPT_INCLUDE:
@@
-93,15
+88,13
@@
source_init_option_callback (int id, void *aux UNUSED)
break;
case OPT_SYNTAX:
break;
case OPT_SYNTAX:
- if (!strcmp (optarg, "compatible")
)
+ if (!strcmp (optarg, "compatible"))
settings_set_syntax (COMPATIBLE);
else if (!strcmp (optarg, "enhanced"))
settings_set_syntax (ENHANCED);
else
settings_set_syntax (COMPATIBLE);
else if (!strcmp (optarg, "enhanced"))
settings_set_syntax (ENHANCED);
else
- /* TRANSLATORS: Leave the words `compatible' and `enhanced' in their
- original English. */
error (1, 0,
error (1, 0,
- _("Syntax must be either `
compatible' or `enhanced'.")
);
+ _("Syntax must be either `
%s' or `%s'."), "compatible", "enhanced"
);
break;
default:
break;
default: