projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Fix buffer overread in journaling when source does not end in \n.
[pspp]
/
src
/
data
/
settings.c
diff --git
a/src/data/settings.c
b/src/data/settings.c
index 0868a331891c94b24a26a823086ad2e34d98a83e..114200cf060d5a4ed0d5adc2c910f2a3e81b0c42 100644
(file)
--- a/
src/data/settings.c
+++ b/
src/data/settings.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011
, 2015
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
@@
-29,7
+29,6
@@
#include "libpspp/integer-format.h"
#include "libpspp/message.h"
#include "libpspp/integer-format.h"
#include "libpspp/message.h"
-#include "gl/error.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
@@
-67,6
+66,7
@@
struct settings
size_t workspace;
struct fmt_spec default_format;
bool testing_mode;
size_t workspace;
struct fmt_spec default_format;
bool testing_mode;
+ int fuzzbits;
int cmd_algorithm;
int global_algorithm;
int cmd_algorithm;
int global_algorithm;
@@
-105,10
+105,11
@@
static struct settings the_settings = {
true, /* printback */
true, /* mprint */
true, /* printback */
true, /* mprint */
-
1,
/* mxloops */
+
40,
/* mxloops */
64L * 1024 * 1024, /* workspace */
{FMT_F, 8, 2}, /* default_format */
false, /* testing_mode */
64L * 1024 * 1024, /* workspace */
{FMT_F, 8, 2}, /* default_format */
false, /* testing_mode */
+ 6, /* fuzzbits */
ENHANCED, /* cmd_algorithm */
ENHANCED, /* global_algorithm */
ENHANCED, /* syntax */
ENHANCED, /* cmd_algorithm */
ENHANCED, /* global_algorithm */
ENHANCED, /* syntax */
@@
-373,9
+374,9
@@
settings_get_max_messages (enum msg_severity severity)
/* Sets the maximum number of messages to show of the given SEVERITY before
aborting to MAX. (The value for MSG_S_WARNING is interpreted as maximum
/* Sets the maximum number of messages to show of the given SEVERITY before
aborting to MAX. (The value for MSG_S_WARNING is interpreted as maximum
- number of warnings and errors combined.) In addition, in the case of
+ number of warnings and errors combined.) In addition, in the case of
warnings the special value of zero indicates that no warnings are to be
warnings the special value of zero indicates that no warnings are to be
- issued.
+ issued.
*/
void
settings_set_max_messages (enum msg_severity severity, int max)
*/
void
settings_set_max_messages (enum msg_severity severity, int max)
@@
-452,7
+453,7
@@
settings_get_workspace_cases (const struct caseproto *proto)
bytes. */
void
bytes. */
void
-settings_set_workspace (
size_t workspace)
+settings_set_workspace (size_t workspace)
{
the_settings.workspace = workspace;
}
{
the_settings.workspace = workspace;
}
@@
-488,6
+489,18
@@
settings_set_testing_mode ( bool testing_mode)
the_settings.testing_mode = testing_mode;
}
the_settings.testing_mode = testing_mode;
}
+int
+settings_get_fuzzbits (void)
+{
+ return the_settings.fuzzbits;
+}
+
+void
+settings_set_fuzzbits (int fuzzbits)
+{
+ the_settings.fuzzbits = fuzzbits;
+}
+
/* Return the current algorithm setting */
enum behavior_mode
settings_get_algorithm (void)
/* Return the current algorithm setting */
enum behavior_mode
settings_get_algorithm (void)
@@
-694,7
+707,7
@@
settings_get_output_routing (enum settings_output_type type)
return the_settings.output_routing[type] | SETTINGS_DEVICE_UNFILTERED;
}
return the_settings.output_routing[type] | SETTINGS_DEVICE_UNFILTERED;
}
-enum settings_value_style
+enum settings_value_style
settings_get_value_style (void)
{
return the_settings.value_output_style;
settings_get_value_style (void)
{
return the_settings.value_output_style;
@@
-713,3
+726,10
@@
settings_get_var_style (void)
{
return the_settings.var_output_style;
}
{
return the_settings.var_output_style;
}
+
+
+void
+settings_set_var_style (enum settings_var_style s)
+{
+ the_settings.var_output_style = s;
+}