[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/data-in.c sr...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/10/20 11:32:57

Modified files:
        po             : de.po pspp.pot 
        src/data       : data-in.c data-out.c format.c format.h 
                         identifier.h 
        src/language/control: control-stack.c 
        src/language/data-io: print-space.c 
        src/language/expressions: optimize.c parse.c private.h 
        src/language/lexer: lexer.c 
        src/language/stats: frequencies.q means.q regression.q 
        src/output     : postscript.c table.c 

Log message:
        Constness and global namespace patrol.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-out.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/format.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/format.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/identifier.h?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/control-stack.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print-space.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/optimize.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/parse.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/private.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/means.q?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/regression.q?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/postscript.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/table.c?cvsroot=pspp&r1=1.12&r2=1.13

Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/de.po    19 Oct 2006 15:04:52 -0000      1.15
+++ po/de.po    20 Oct 2006 11:32:56 -0000      1.16
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-10-19 16:31+0800\n"
+"POT-Creation-Date: 2006-10-20 10:21+0800\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"

Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- po/pspp.pot 19 Oct 2006 15:04:52 -0000      1.100
+++ po/pspp.pot 20 Oct 2006 11:32:56 -0000      1.101
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-10-19 16:31+0800\n"
+"POT-Creation-Date: 2006-10-20 10:21+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"

Index: src/data/data-in.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/data/data-in.c  14 Oct 2006 00:25:20 -0000      1.13
+++ src/data/data-in.c  20 Oct 2006 11:32:57 -0000      1.14
@@ -1394,7 +1394,8 @@
     }
   
   {
-    static bool (*const handlers[FMT_NUMBER_OF_FORMATS])(struct data_in *) = 
+    typedef bool (*handler_t) (struct data_in *);
+    static const handler_t handlers[FMT_NUMBER_OF_FORMATS] = 
       {
        parse_numeric, parse_N, parse_numeric, parse_numeric,
        parse_numeric, parse_numeric, parse_numeric,
@@ -1407,7 +1408,7 @@
        parse_WKDAY, parse_MONTH,
       };
 
-    bool (*handler)(struct data_in *);
+    handler_t handler;
     bool success;
 
     handler = handlers[i->format.type];

Index: src/data/data-out.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-out.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/data/data-out.c 8 Jul 2006 03:05:51 -0000       1.6
+++ src/data/data-out.c 20 Oct 2006 11:32:57 -0000      1.7
@@ -348,7 +348,7 @@
 static int
 convert_Z (char *dst, const struct fmt_spec *fp, double number)
 {
-  static int warned = 0;
+  static bool warned = false;
 
   if (!warned)
     {

Index: src/data/format.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/format.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/data/format.c   18 Jul 2006 04:57:01 -0000      1.8
+++ src/data/format.c   20 Oct 2006 11:32:57 -0000      1.9
@@ -35,7 +35,7 @@
 #define DEFFMT(LABEL, NAME, N_ARGS, IMIN_W, IMAX_W, OMIN_W, OMAX_W, CAT, \
               OUTPUT, SPSS_FMT) \
        {NAME, N_ARGS, IMIN_W, IMAX_W, OMIN_W, OMAX_W, CAT, OUTPUT, SPSS_FMT},
-struct fmt_desc formats[FMT_NUMBER_OF_FORMATS + 1] =
+const struct fmt_desc formats[FMT_NUMBER_OF_FORMATS + 1] =
 {
 #include "format.def"
   {"",         -1, -1,  -1, -1,   -1, 0000, -1, -1},
@@ -85,7 +85,7 @@
 static bool
 check_common_specifier (const struct fmt_spec *spec, bool emit_error)
 {
-  struct fmt_desc *f ; 
+  const struct fmt_desc *f ; 
   char *str;
 
   assert (spec->type < FMT_NUMBER_OF_FORMATS);
@@ -125,7 +125,7 @@
 int
 check_input_specifier (const struct fmt_spec *spec, int emit_error)
 {
-  struct fmt_desc *f;
+  const struct fmt_desc *f;
   char *str ;
 
   if (!check_common_specifier (spec, emit_error))
@@ -165,7 +165,7 @@
 int
 check_output_specifier (const struct fmt_spec *spec, int emit_error)
 {
-  struct fmt_desc *f;
+  const struct fmt_desc *f;
   char *str ; 
 
   if (!check_common_specifier (spec, emit_error))

Index: src/data/format.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/format.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/data/format.h   18 Jul 2006 04:57:01 -0000      1.4
+++ src/data/format.h   20 Oct 2006 11:32:57 -0000      1.5
@@ -98,7 +98,7 @@
 
 
 /* Descriptions of all the display formats above. */
-extern struct fmt_desc formats[];
+extern const struct fmt_desc formats[];
 
 union value;
 

Index: src/data/identifier.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/identifier.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/data/identifier.h       4 Mar 2006 01:11:57 -0000       1.1
+++ src/data/identifier.h       20 Oct 2006 11:32:57 -0000      1.2
@@ -68,4 +68,6 @@
 bool lex_id_match (const char *keyword_string, const char *token_string);
 int lex_id_to_token (const char *id, size_t len);
 
+extern const char *keywords[T_N_KEYWORDS + 1] ;
+
 #endif /* !lex_def_h */

Index: src/language/control/control-stack.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/control/control-stack.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/language/control/control-stack.c        15 Mar 2006 03:29:10 -0000      
1.3
+++ src/language/control/control-stack.c        20 Oct 2006 11:32:57 -0000      
1.4
@@ -16,7 +16,7 @@
     void *private;              /* Private data. */
   };
 
-struct ctl_struct *ctl_stack;
+static struct ctl_struct *ctl_stack;
 
 void
 ctl_stack_clear (void) 

Index: src/language/data-io/print-space.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/print-space.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/language/data-io/print-space.c  19 Oct 2006 15:04:53 -0000      1.3
+++ src/language/data-io/print-space.c  20 Oct 2006 11:32:57 -0000      1.4
@@ -41,8 +41,7 @@
   {
     struct dfm_writer *writer;  /* Output data file. */
     struct expression *expr;   /* Number of lines; NULL means 1. */
-  }
-print_space_trns;
+  };
 
 static trns_proc_func print_space_trns_proc;
 static trns_free_func print_space_trns_free;

Index: src/language/expressions/optimize.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/optimize.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/expressions/optimize.c 8 Jul 2006 03:05:51 -0000       1.4
+++ src/language/expressions/optimize.c 20 Oct 2006 11:32:57 -0000      1.5
@@ -45,7 +45,7 @@
 {
   int nonconst_cnt = 0; /* Number of nonconstant children. */
   int sysmis_cnt = 0;   /* Number of system-missing children. */
-  struct operation *op;
+  const struct operation *op;
   struct composite_node *c;
   int i;
 
@@ -308,7 +308,7 @@
 static void
 flatten_composite (union any_node *n, struct expression *e)
 {
-  struct operation *op = &operations[n->type];
+  const struct operation *op = &operations[n->type];
   size_t i;
       
   for (i = 0; i < n->composite.arg_cnt; i++)

Index: src/language/expressions/parse.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/parse.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/language/expressions/parse.c    19 Oct 2006 15:04:53 -0000      1.14
+++ src/language/expressions/parse.c    20 Oct 2006 11:32:57 -0000      1.15
@@ -894,7 +894,7 @@
 
 /* Individual function parsing. */
 
-struct operation operations[OP_first + OP_cnt] = {
+const struct operation operations[OP_first + OP_cnt] = {
 #include "parse.inc"
 };
     
@@ -953,7 +953,7 @@
                         const struct operation **first,
                         const struct operation **last)
 {
-  struct operation *f;
+  const struct operation *f;
   
   for (f = operations + OP_function_first;
        f <= operations + OP_function_last; f++) 
@@ -1327,7 +1327,7 @@
 static bool
 is_valid_node (union any_node *n) 
 {
-  struct operation *op;
+  const struct operation *op;
   size_t i;
   
   assert (n != NULL);

Index: src/language/expressions/private.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/expressions/private.h  9 Jun 2006 22:51:24 -0000       1.4
+++ src/language/expressions/private.h  20 Oct 2006 11:32:57 -0000      1.5
@@ -78,7 +78,7 @@
     int array_granularity;
   };
 
-extern struct operation operations[];
+extern const struct operation operations[];
 
 /* Tree structured expressions. */ 
 

Index: src/language/lexer/lexer.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/lexer/lexer.c  14 Oct 2006 00:25:20 -0000      1.8
+++ src/language/lexer/lexer.c  20 Oct 2006 11:32:57 -0000      1.9
@@ -46,11 +46,6 @@
 */
 
 
-/* Global variables. */
-
-extern const char *keywords[T_N_KEYWORDS + 1];
-
-
 /* Current token. */
 int token;
 
@@ -859,7 +854,7 @@
       return t;
     }
 
-  return _("<ERROR>");
+  NOT_REACHED ();
 }
 
 /* Returns an ASCII representation of the current token as a

Index: src/language/stats/frequencies.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/language/stats/frequencies.q    19 Oct 2006 15:04:53 -0000      1.16
+++ src/language/stats/frequencies.q    20 Oct 2006 11:32:57 -0000      1.17
@@ -1168,9 +1168,9 @@
       const char *s;
     };
 
-  struct init *p;
+  const struct init *p;
 
-  static struct init vec[] =
+  static const struct init vec[] =
   {
     {4, 0, N_("Valid")},
     {5, 0, N_("Cum")},

Index: src/language/stats/means.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/means.q,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/stats/means.q  19 Oct 2006 15:04:53 -0000      1.8
+++ src/language/stats/means.q  20 Oct 2006 11:32:57 -0000      1.9
@@ -52,13 +52,12 @@
 /* (functions) */
 
 /* TABLES: Variable lists for each dimension. */
-int n_dim;             /* Number of dimensions. */
-size_t *nv_dim;                /* Number of variables in each dimension. */
-struct variable ***v_dim;      /* Variables in each dimension.  */
+static int n_dim;              /* Number of dimensions. */
+static size_t *nv_dim;         /* Number of variables in each dimension. */
+static struct variable ***v_dim;       /* Variables in each dimension.  */
 
 /* VARIABLES: List of variables. */
-int n_var;
-struct variable **v_var;
+static struct variable **v_var;
 
 /* Parses and executes the T-TEST procedure. */
 int

Index: src/language/stats/regression.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/regression.q,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/language/stats/regression.q     19 Oct 2006 15:04:53 -0000      1.32
+++ src/language/stats/regression.q     20 Oct 2006 11:32:57 -0000      1.33
@@ -84,7 +84,7 @@
 static struct cmd_regression cmd;
 
 /* Linear regression models. */
-pspp_linreg_cache **models = NULL;
+static pspp_linreg_cache **models = NULL;
 
 /*
   Transformations for saving predicted values
@@ -110,12 +110,12 @@
   File where the model will be saved if the EXPORT subcommand
   is given. 
  */
-struct file_handle *model_file;
+static struct file_handle *model_file;
 
 /*
   Return value for the procedure.
  */
-int pspp_reg_rc = CMD_SUCCESS;
+static int pspp_reg_rc = CMD_SUCCESS;
 
 static bool run_regression (const struct ccase *,
                             const struct casefile *, void *);

Index: src/output/postscript.c
===================================================================
RCS file: /sources/pspp/pspp/src/output/postscript.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/output/postscript.c     8 Jul 2006 03:05:52 -0000       1.19
+++ src/output/postscript.c     20 Oct 2006 11:32:57 -0000      1.20
@@ -109,8 +109,7 @@
 
     struct font *fonts[OUTP_FONT_CNT];
     int last_font;              /* Index of last font set with setfont. */
-  }
-ps_driver_ext;
+  };
 
 /* Transform logical y-ordinate Y into a page ordinate. */
 #define YT(Y) (this->length - (Y))

Index: src/output/table.c
===================================================================
RCS file: /sources/pspp/pspp/src/output/table.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/output/table.c  8 Oct 2006 01:49:15 -0000       1.12
+++ src/output/table.c  20 Oct 2006 11:32:57 -0000      1.13
@@ -838,7 +838,7 @@
 
 static struct tab_table *t;
 static struct outp_driver *d;
-int tab_hit;
+static int tab_hit;
 
 /* Set the current table to TABLE. */
 static void