Fix some warnings.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 35a8ed1e3227cc7dab65df8ffbcbefb0042a4d29..b87a9395524d333e2e8d58f98ef9a85fafe740d1 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  3 13:22:39 2006  Ben Pfaff  <blp@gnu.org>
+
+       * variable.c (var_is_valid_name): Move declarations before code
+       for C90 compliance.
+
 Tue Apr  4 15:28:40 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * filename.ch (fn_interp_vars): Fixed small buglet.

diff --git a/src/language/data-io/ChangeLog b/src/language/data-io/ChangeLog
index 4a96aeb941a9479876c7386203e97d30fc102f8b..256cc20cb0b2628ee1fbfe9eb17f7b91232ab7ab 100644 (file)
--- a/src/language/data-io/ChangeLog
+++ b/src/language/data-io/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 15 18:00:32 2006  Ben Pfaff  <blp@gnu.org>
+
+       * data-list.c: Add prototype to suppress warning for
+       cmd_repeating_data().
+       
 Thu Mar  2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
        
        * Moved files from src directory

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index db67a367cd63f18cb3316a1be412d8c59d4aaf04..db7fc3bf8d5994853f75ab49b44513a28d35a63f 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -1348,6 +1348,8 @@ static int parse_repeating_data (struct dls_var_spec **,
 static void find_variable_input_spec (struct variable *v,
                                      struct fmt_spec *spec);
 
+int cmd_repeating_data (void);
+
 /* Parses the REPEATING DATA command. */
 int
 cmd_repeating_data (void)

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index 00025ead43b1793d118417c4e603ac7ecb48674d..6aaada8e73b18291ad175a380f61a8647e88bcbc 100644 (file)
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -23,6 +23,7 @@
 #include <language/command.h>
 #include <data/dictionary.h>
 #include <libpspp/message.h>
+#include <language/data-io/file-handle.h>
 #include <data/file-handle-def.h>
 #include <libpspp/hash.h>
 #include <language/lexer/lexer.h>

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 1f9bc7e49d7b7830cd4f9e2db6997cd4c97ce821..5421a3c1c95069e46f6d42dc9cc69fb046423fee 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -27,6 +27,7 @@
 #include <data/dictionary.h>
 #include <libpspp/message.h>
 #include <data/file-handle-def.h>
+#include <language/data-io/file-handle.h>
 #include <libpspp/hash.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/magic.h>

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 89829de204bbdc11eeda7cbed9f4e34edbc208bb..ffdee8ac082551e11685271bb5c2a223dd5865bb 100644 (file)
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 15 18:01:03 2006  Ben Pfaff  <blp@gnu.org>
+
+       * examine.q (output_examine): Add casts to fix warnings.
+
 2006-04-07  Jason Stover  <jhs@math.gcsu.edu>
 
        * regression.q (subcommand_save): New function.

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 793a7256f2ee792e9cf04e81075a8bc17aa9f7f4..4b8bf46b365d8ae46025700c3361ea0852074055 100644 (file)
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -28,7 +28,9 @@
 #include <data/dictionary.h>
 #include <libpspp/message.h>
 #include <data/file-handle-def.h>
+#include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
+#include <language/stats/sort-criteria.h>
 #include <libpspp/misc.h>
 #include <math/moments.h>
 #include <libpspp/pool.h>

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 10818591e521ee31b1f63c57101218db9679668c..830ae37b1ca6259c979ef78daf5fff980ec1121d 100644 (file)
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -23,6 +23,7 @@
 #include <libpspp/compiler.h>
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
+#include <language/data-io/file-handle.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <data/variable.h>

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index aad3baa10fd4380e68b0faddede7d834480b6966..4f8e45de6c52f9aea8c3acd012a73b6d3b79bcf6 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -285,12 +285,13 @@ output_examine(void)
            {
              if ( cmd.cmp == XMN_GROUPS ) 
                {
-                 box_plot_group(0, dependent_vars, n_dependent_vars, 
-                                cmd.v_id);
+                 box_plot_group (0, (const struct variable **) dependent_vars,
+                                  n_dependent_vars, cmd.v_id);
                }
              else
-               box_plot_variables(0, dependent_vars, n_dependent_vars,
-                                  cmd.v_id);
+               box_plot_variables (0,
+                                    (const struct variable **) dependent_vars,
+                                    n_dependent_vars, cmd.v_id);
            }
 
          if ( cmd.a_plot[XMN_PLT_HISTOGRAM] ) 
@@ -342,11 +343,13 @@ output_examine(void)
          if ( cmd.a_plot[XMN_PLT_BOXPLOT] )
            {
              if ( cmd.cmp == XMN_VARIABLES ) 
-               box_plot_variables(fctr, dependent_vars, n_dependent_vars, 
-                                  cmd.v_id);
+               box_plot_variables (fctr,
+                                    (const struct variable **) dependent_vars,
+                                    n_dependent_vars, cmd.v_id);
              else
-               box_plot_group(fctr, dependent_vars, n_dependent_vars, 
-                              cmd.v_id);
+               box_plot_group (fctr,
+                                (const struct variable **) dependent_vars,
+                                n_dependent_vars, cmd.v_id);
            }
 
          for ( v = 0 ; v < n_dependent_vars; ++v )

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index b34299322db347a58940144109afc5e971beb053..375530bc859861a5939aea051b6b1e9ba690fa31 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -54,6 +54,7 @@
 #include <output/charts/piechart.h>
 #include <output/chart.h>
 #include <output/charts/plot-hist.h>
+#include <math/histogram.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index 92667f1cf0e10c9b4740b8709bd11bcf076a9dfe..67e182a01129a7c9fc6c922f84dddcd56d472cc1 100644 (file)
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include <config.h>
 #include <language/command.h>
+#include <language/stats/sort-criteria.h>
 #include <libpspp/compiler.h>
 #include <data/dictionary.h>
 #include <math/sort.h>

diff --git a/src/language/stats/sort-criteria.h b/src/language/stats/sort-criteria.h
index 8ee3dbaa28ffa391c0712f6f9e1e5f0b104b0c5c..0c804a8c36eda594712e01d241149eda4282ae8b 100644 (file)
--- a/src/language/stats/sort-criteria.h
+++ b/src/language/stats/sort-criteria.h
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 struct variable;
 struct dictionary;

diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c
index c3412e0419cb2c4d564183ae2f41e55ad304c497..619f797e0356df49fc18efd8a7c8f03aefd70009 100644 (file)
--- a/src/language/tests/moments-test.c
+++ b/src/language/tests/moments-test.c
@@ -23,9 +23,9 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <math/moments.h>
-#include "xalloc.h"
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
+#include "xalloc.h"
 
 #define _(msgid) gettext (msgid)
 

diff --git a/src/math/ChangeLog b/src/math/ChangeLog
index 4a96aeb941a9479876c7386203e97d30fc102f8b..4ace108009001b08436ccccb15ac25d8ed597cec 100644 (file)
--- a/src/math/ChangeLog
+++ b/src/math/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 15 18:01:22 2006  Ben Pfaff  <blp@gnu.org>
+
+       * factor-stats.c (metrics_postcalc): Add casts to fix warnings.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
        
        * Moved files from src directory

diff --git a/src/math/factor-stats.c b/src/math/factor-stats.c
index 47d17706fe85e96e3d4c3360c7337a7c2f4530af..fde6abe1d99e01c3c6b5af19fdc9322256466260 100644 (file)
--- a/src/math/factor-stats.c
+++ b/src/math/factor-stats.c
@@ -185,9 +185,11 @@ metrics_postcalc(struct metrics *m)
 
 
   /* Calculate the percentiles */
-  ptiles(m->ptile_hash, m->wvp, m->n_data, m->n, m->ptile_alg);
+  ptiles (m->ptile_hash, (const struct weighted_value **) m->wvp,
+          m->n_data, m->n, m->ptile_alg);
 
-  tukey_hinges(m->wvp, m->n_data, m->n, m->hinge);
+  tukey_hinges ((const struct weighted_value **) m->wvp,
+                m->n_data, m->n, m->hinge);
 
   /* Special case here */
   if ( k1 + 1 == k2 ) 

diff --git a/src/math/linreg/ChangeLog b/src/math/linreg/ChangeLog
index c31f24a56dcb83ef2d0b98462610dd4d3a050377..ca3a647cba9c314bd73fb0c89206ec554b7bfc45 100644 (file)
--- a/src/math/linreg/ChangeLog
+++ b/src/math/linreg/ChangeLog
@@ -1,3 +1,20 @@
+Sat Apr 15 18:03:01 2006  Ben Pfaff  <blp@gnu.org>
+
+       * predict.c (pspp_linreg_predict): Change prototype to match
+       struct pspp_linreg_cache_struct's predict member.
+       * predict.c (pspp_linreg_residual): Change prototype to match
+       struct pspp_linreg_cache_struct's residual member.
+
+Sat Apr 15 18:01:39 2006  Ben Pfaff  <blp@gnu.org>
+
+       * coefficient.c (pspp_linreg_get_coeff): Compare n_indeps against
+       0, instead of NULL, because it's an integer type.
+
+Mon Apr  3 13:20:54 2006  Ben Pfaff  <blp@gnu.org>
+
+       * linreg.c (pspp_linreg): Move declaration before code for C90
+       compliance.
+
 2006-04-09  Jason Stover  <jhs@math.gcsu.edu>
 
        * predict.c (pspp_linreg_predict): Do something sensible even with

diff --git a/src/math/linreg/coefficient.c b/src/math/linreg/coefficient.c
index 2154ffe4ae0329610dc4d60bec0736bc33710ece..2cca9f54653327918691ab228966f32ca82d03b8 100644 (file)
--- a/src/math/linreg/coefficient.c
+++ b/src/math/linreg/coefficient.c
@@ -196,7 +196,7 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c,
     {
       return NULL;
     }
-  if (c->coeff == NULL || c->n_indeps == NULL || v == NULL)
+  if (c->coeff == NULL || c->n_indeps == 0 || v == NULL)
     {
       return NULL;
     }

diff --git a/src/math/linreg/linreg.h b/src/math/linreg/linreg.h
index 771236a80e9e33cea19a053d34c73ada58aa3a1c..727d764c65949fb4f7bbec0cc094f9bc31b58b42 100644 (file)
--- a/src/math/linreg/linreg.h
+++ b/src/math/linreg/linreg.h
@@ -191,8 +191,8 @@ pspp_linreg (const gsl_vector * Y, const gsl_matrix * X,
 
 double
 pspp_linreg_predict (const struct variable **, const union value **,
-                    const pspp_linreg_cache *, int);
+                    const void *, int);
 double
 pspp_linreg_residual (const struct variable **, const union value **,
-                     const union value *, const pspp_linreg_cache *, int);
+                     const union value *, const void *, int);
 #endif

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 49e24434b5ff5cca2ae5ae1d95ecffc335b06040..34e709c82782e039a4c2d6f19b218fda21c64f52 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -31,8 +31,9 @@
 double
 pspp_linreg_predict (const struct variable **predictors,
                     const union value **vals,
-                    const pspp_linreg_cache * c, int n_vals)
+                    const void *c_, int n_vals)
 {
+  const pspp_linreg_cache *c = c_;
   int i;
   int j;
   const struct pspp_linreg_coeff **found;
@@ -86,8 +87,9 @@ double
 pspp_linreg_residual (const struct variable **predictors,
                      const union value **vals,
                      const union value *obs,
-                     const pspp_linreg_cache * c, int n_vals)
+                     const void *c_, int n_vals)
 {
+  const pspp_linreg_cache *c = c_;
   double pred;
   double result;
 

diff --git a/src/math/sort.c b/src/math/sort.c
index 20d8dde73cb81a34fca282eab444d10760a300ec..4d64b32474412bd3fcd1682ab0f572315fa5bc99 100644 (file)
--- a/src/math/sort.c
+++ b/src/math/sort.c
@@ -30,6 +30,7 @@
 #include <data/case.h>
 #include <data/casefile.h>
 #include <libpspp/message.h>
+#include <language/expressions/public.h>
 
 #include <libpspp/misc.h>
 #include <data/settings.h>