zip-reader: Read the whole central directory at .zip open time.

[pspp] / src / data / settings.c

diff --git a/src/data/settings.c b/src/data/settings.c
index b1d4a80b9d2773b798fe432e2731aa215979865d..f4efb99fa84ee0d4eedd18236f72db9c6b363954 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;


@@ -76,8 +76,8 @@ struct settings
 
   enum settings_output_devices output_routing[SETTINGS_N_OUTPUT_TYPES];
 
 
   enum settings_output_devices output_routing[SETTINGS_N_OUTPUT_TYPES];
 

-  enum settings_var_style var_output_style;
-  enum settings_value_style value_output_style;
+  enum settings_value_show show_values;
+  enum settings_value_show show_variables;

 };
 
 static struct settings the_settings = {
 };
 
 static struct settings the_settings = {


@@ -109,6 +109,7 @@ static struct settings the_settings = {
   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 */


@@ -120,8 +121,8 @@ static struct settings the_settings = {
    0,
    SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL},
 
    0,
    SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL},
 

-  SETTINGS_VAR_STYLE_LABELS,
-  SETTINGS_VAL_STYLE_LABELS
+  SETTINGS_VALUE_SHOW_LABEL,
+  SETTINGS_VALUE_SHOW_LABEL

 };
 
 /* Initializes the settings module. */
 };
 
 /* Initializes the settings module. */


@@ -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)


@@ -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,29 +707,27 @@ 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 
-settings_get_value_style (void)
+enum settings_value_show
+settings_get_show_values (void)

 {
 {

-  return the_settings.value_output_style;
+  return the_settings.show_values;

 }
 
 void
 }
 
 void

-settings_set_value_style (enum settings_value_style s)
+settings_set_show_values (enum settings_value_show s)

 {
 {

-  the_settings.value_output_style = s;
+  the_settings.show_values = s;

 }
 
 
 }
 
 

-
-enum settings_var_style
-settings_get_var_style (void)
+enum settings_value_show
+settings_get_show_variables (void)

 {
 {

-  return the_settings.var_output_style;
+  return the_settings.show_variables;

 }
 
 }
 

-

 void
 void

-settings_set_var_style (enum settings_var_style s)
+settings_set_show_variables (enum settings_value_show s)

 {
 {

-  the_settings.var_output_style = s;
+  the_settings.show_variables = s;

 }
 }