projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
settings: Avoid using a pointer and global data for algorithms.
[pspp]
/
src
/
data
/
settings.c
diff --git
a/src/data/settings.c
b/src/data/settings.c
index b98a1351ac0eee0855222b9c341c1f04ec0da54f..551556f011cd89affcb3050042174948d73f268a 100644
(file)
--- a/
src/data/settings.c
+++ b/
src/data/settings.c
@@
-33,8
+33,6
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-static int global_algorithm = ENHANCED;
-
struct settings
{
/* Integer format used for IB and PIB input. */
struct settings
{
/* Integer format used for IB and PIB input. */
@@
-49,8
+47,8
@@
struct settings
/* Format of reals in output (SET WRB). */
enum float_format output_float_format;
/* Format of reals in output (SET WRB). */
enum float_format output_float_format;
- int
*
viewlength;
- int
*
viewwidth;
+ int viewlength;
+ int viewwidth;
bool safer_mode;
bool include;
int epoch;
bool safer_mode;
bool include;
int epoch;
@@
-70,7
+68,7
@@
struct settings
bool testing_mode;
int cmd_algorithm;
bool testing_mode;
int cmd_algorithm;
- int
*
algorithm;
+ int
global_
algorithm;
int syntax;
struct fmt_settings *styles;
int syntax;
struct fmt_settings *styles;
@@
-83,8
+81,8
@@
static struct settings the_settings = {
FLOAT_NATIVE_DOUBLE, /* input_float_format */
INTEGER_NATIVE, /* output_integer_format */
FLOAT_NATIVE_DOUBLE, /* output_float_format */
FLOAT_NATIVE_DOUBLE, /* input_float_format */
INTEGER_NATIVE, /* output_integer_format */
FLOAT_NATIVE_DOUBLE, /* output_float_format */
-
NULL,
/* viewlength */
-
NULL,
/* viewwidth */
+
24,
/* viewlength */
+
79,
/* viewwidth */
false, /* safer_mode */
true, /* include */
-1, /* epoch */
false, /* safer_mode */
true, /* include */
-1, /* epoch */
@@
-110,7
+108,7
@@
static struct settings the_settings = {
{FMT_F, 8, 2}, /* default_format */
false, /* testing_mode */
ENHANCED, /* cmd_algorithm */
{FMT_F, 8, 2}, /* default_format */
false, /* testing_mode */
ENHANCED, /* cmd_algorithm */
-
&global_algorithm, /*
algorithm */
+
ENHANCED, /* global_
algorithm */
ENHANCED, /* syntax */
NULL, /* styles */
ENHANCED, /* syntax */
NULL, /* styles */
@@
-121,12
+119,9
@@
static struct settings the_settings = {
SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL}
};
SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL}
};
-static void init_viewport ( int *, int *);
-
void
void
-settings_init (
int *width, int *length
)
+settings_init (
void
)
{
{
- init_viewport (width, length);
settings_set_epoch (-1);
the_settings.styles = fmt_settings_create ();
settings_set_epoch (-1);
the_settings.styles = fmt_settings_create ();
@@
-203,35
+198,28
@@
settings_set_output_float_format ( enum float_format float_format)
int
settings_get_viewlength (void)
{
int
settings_get_viewlength (void)
{
- return
*
the_settings.viewlength;
+ return the_settings.viewlength;
}
/* Sets the view length. */
void
settings_set_viewlength ( int viewlength_)
{
}
/* Sets the view length. */
void
settings_set_viewlength ( int viewlength_)
{
-
*
the_settings.viewlength = viewlength_;
+ the_settings.viewlength = viewlength_;
}
/* Screen width. */
int
settings_get_viewwidth(void)
{
}
/* Screen width. */
int
settings_get_viewwidth(void)
{
- return
*
the_settings.viewwidth;
+ return the_settings.viewwidth;
}
/* Sets the screen width. */
void
settings_set_viewwidth ( int viewwidth_)
{
}
/* Sets the screen width. */
void
settings_set_viewwidth ( int viewwidth_)
{
- *the_settings.viewwidth = viewwidth_;
-}
-
-static void
-init_viewport ( int *width, int *length)
-{
- the_settings.viewwidth = width;
- the_settings.viewlength = length;
+ the_settings.viewwidth = viewwidth_;
}
/* Whether PSPP can erase and overwrite files. */
}
/* Whether PSPP can erase and overwrite files. */
@@
-488,14
+476,14
@@
settings_set_testing_mode ( bool testing_mode)
enum behavior_mode
settings_get_algorithm (void)
{
enum behavior_mode
settings_get_algorithm (void)
{
- return
*the_settings.
algorithm;
+ return
the_settings.cmd_
algorithm;
}
/* Set the algorithm option globally. */
void
settings_set_algorithm (enum behavior_mode mode)
{
}
/* Set the algorithm option globally. */
void
settings_set_algorithm (enum behavior_mode mode)
{
-
global
_algorithm = mode;
+
the_settings.global_algorithm = the_settings.cmd
_algorithm = mode;
}
/* Set the algorithm option for this command only */
}
/* Set the algorithm option for this command only */
@@
-503,14
+491,13
@@
void
settings_set_cmd_algorithm ( enum behavior_mode mode)
{
the_settings.cmd_algorithm = mode;
settings_set_cmd_algorithm ( enum behavior_mode mode)
{
the_settings.cmd_algorithm = mode;
- the_settings.algorithm = &the_settings.cmd_algorithm;
}
/* Unset the algorithm option for this command */
void
unset_cmd_algorithm (void)
{
}
/* Unset the algorithm option for this command */
void
unset_cmd_algorithm (void)
{
- the_settings.
algorithm = &
global_algorithm;
+ the_settings.
cmd_algorithm = the_settings.
global_algorithm;
}
/* Get the current syntax setting */
}
/* Get the current syntax setting */