projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
output
/
options.c
diff --git
a/src/output/options.c
b/src/output/options.c
index 593adf5af0bd399b9a3d3cd8d3d025fd2901b1d6..b8921255d3b08e59b592021b7a025f59f7af1e38 100644
(file)
--- a/
src/output/options.c
+++ b/
src/output/options.c
@@
-29,7
+29,6
@@
#include "output/driver-provider.h"
#include "output/measure.h"
#include "output/driver-provider.h"
#include "output/measure.h"
-#include "gl/error.h"
#include "gl/xalloc.h"
#include "gettext.h"
#include "gl/xalloc.h"
#include "gettext.h"
@@
-110,7
+109,7
@@
do_parse_boolean (const char *driver_name, const char *key,
return false;
else
{
return false;
else
{
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but a Boolean value is required"),
+
msg (MW, _("%s: `%s' is `%s'
but a Boolean value is required"),
driver_name, value, key);
return -1;
}
driver_name, value, key);
return -1;
}
@@
-145,7
+144,7
@@
parse_boolean (struct driver_option *o)
O has no user-specified value, then O's default value is treated the same
way. If the default value still does not match, parse_enum() returns 0.
O has no user-specified value, then O's default value is treated the same
way. If the default value still does not match, parse_enum() returns 0.
- Example: parse_enum (o, "a", 1, "b", 2,
(char *) NUL
L) returns 1 if O's
+ Example: parse_enum (o, "a", 1, "b", 2,
NULL_SENTINE
L) returns 1 if O's
value if "a", 2 if O's value is "b".
Destroys O. */
value if "a", 2 if O's value is "b".
Destroys O. */
@@
-185,7
+184,7
@@
parse_enum (struct driver_option *o, ...)
ds_put_format (&choices, "`%s'", s);
}
ds_put_format (&choices, "`%s'", s);
}
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but one of the following "
+
msg (MW, _("%s: `%s' is `%s'
but one of the following "
"is required: %s"),
o->driver_name, o->name, o->value, ds_cstr (&choices));
ds_destroy (&choices);
"is required: %s"),
o->driver_name, o->name, o->value, ds_cstr (&choices));
ds_destroy (&choices);
@@
-229,22
+228,22
@@
parse_int (struct driver_option *o, int min_value, int max_value)
else if (max_value == INT_MAX)
{
if (min_value == 0)
else if (max_value == INT_MAX)
{
if (min_value == 0)
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but a nonnegative integer "
+
msg (MW, _("%s: `%s' is `%s'
but a nonnegative integer "
"is required"),
o->driver_name, o->name, o->value);
else if (min_value == 1)
"is required"),
o->driver_name, o->name, o->value);
else if (min_value == 1)
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but a positive integer is "
+
msg (MW, _("%s: `%s' is `%s'
but a positive integer is "
"required"), o->driver_name, o->name, o->value);
else if (min_value == INT_MIN)
"required"), o->driver_name, o->name, o->value);
else if (min_value == INT_MIN)
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but an integer is required"),
+
msg (MW, _("%s: `%s' is `%s'
but an integer is required"),
o->driver_name, o->name, o->value);
else
o->driver_name, o->name, o->value);
else
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but an integer greater "
+
msg (MW, _("%s: `%s' is `%s'
but an integer greater "
"than %d is required"),
o->driver_name, o->name, o->value, min_value - 1);
}
else
"than %d is required"),
o->driver_name, o->name, o->value, min_value - 1);
}
else
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but an integer between %d and "
+
msg (MW, _("%s: `%s' is `%s'
but an integer between %d and "
"%d is required"),
o->driver_name, o->name, o->value, min_value, max_value);
}
"%d is required"),
o->driver_name, o->name, o->value, min_value, max_value);
}
@@
-323,8
+322,8
@@
parse_chart_file_name (struct driver_option *o)
chart_file_name = xstrdup (o->value);
else
{
chart_file_name = xstrdup (o->value);
else
{
-
error (0, 0, _("%s: \"%s\" is \"%s\"
but a file name that contains "
- "
\"#\"
is required."),
+
msg (MW, _("%s: `%s' is `%s'
but a file name that contains "
+ "
`#'
is required."),
o->name, o->value, o->driver_name);
chart_file_name = default_chart_file_name (o->default_value);
}
o->name, o->value, o->driver_name);
chart_file_name = default_chart_file_name (o->default_value);
}