[Pspp-cvs] pspp/src data/ChangeLog language/data-io/Change...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/04/16 01:05:15

Modified files:
        src/data       : ChangeLog 
        src/language/data-io: ChangeLog data-list.c 
        src/language/dictionary: apply-dictionary.c sys-file-info.c 
        src/language/stats: ChangeLog aggregate.c correlations.q 
                            examine.q frequencies.q rank.q 
                            sort-criteria.h 
        src/language/tests: moments-test.c 
        src/math       : ChangeLog factor-stats.c sort.c 
        src/math/linreg: ChangeLog coefficient.c linreg.h predict.c 

Log message:
        Fix some warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/apply-dictionary.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/sys-file-info.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/aggregate.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/correlations.q.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/examine.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/frequencies.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/rank.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/sort-criteria.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/tests/moments-test.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/factor-stats.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/sort.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/coefficient.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/linreg.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/linreg/predict.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.9 pspp/src/data/ChangeLog:1.10
--- pspp/src/data/ChangeLog:1.9 Tue Apr  4 07:30:46 2006
+++ pspp/src/data/ChangeLog     Sun Apr 16 01:05:14 2006
@@ -1,3 +1,8 @@
+Mon Apr  3 13:22:39 2006  Ben Pfaff  <address@hidden>
+
+       * variable.c (var_is_valid_name): Move declarations before code
+       for C90 compliance.
+
 Tue Apr  4 15:28:40 WST 2006 John Darrington <address@hidden>
 
        * filename.ch (fn_interp_vars): Fixed small buglet.
Index: pspp/src/language/data-io/ChangeLog
diff -u pspp/src/language/data-io/ChangeLog:1.1 
pspp/src/language/data-io/ChangeLog:1.2
--- pspp/src/language/data-io/ChangeLog:1.1     Sat Mar  4 01:11:57 2006
+++ pspp/src/language/data-io/ChangeLog Sun Apr 16 01:05:15 2006
@@ -1,3 +1,8 @@
+Sat Apr 15 18:00:32 2006  Ben Pfaff  <address@hidden>
+
+       * data-list.c: Add prototype to suppress warning for
+       cmd_repeating_data().
+       
 Thu Mar  2 08:40:33 WST 2006 John Darrington <address@hidden>
        
        * Moved files from src directory
Index: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.5 
pspp/src/language/data-io/data-list.c:1.6
--- pspp/src/language/data-io/data-list.c:1.5   Tue Apr  4 12:43:22 2006
+++ pspp/src/language/data-io/data-list.c       Sun Apr 16 01:05:15 2006
@@ -1348,6 +1348,8 @@
 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)
Index: pspp/src/language/dictionary/apply-dictionary.c
diff -u pspp/src/language/dictionary/apply-dictionary.c:1.2 
pspp/src/language/dictionary/apply-dictionary.c:1.3
--- pspp/src/language/dictionary/apply-dictionary.c:1.2 Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/apply-dictionary.c     Sun Apr 16 01:05:15 2006
@@ -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>
Index: pspp/src/language/dictionary/sys-file-info.c
diff -u pspp/src/language/dictionary/sys-file-info.c:1.3 
pspp/src/language/dictionary/sys-file-info.c:1.4
--- pspp/src/language/dictionary/sys-file-info.c:1.3    Mon Apr  3 20:07:54 2006
+++ pspp/src/language/dictionary/sys-file-info.c        Sun Apr 16 01:05:15 2006
@@ -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>
Index: pspp/src/language/stats/ChangeLog
diff -u pspp/src/language/stats/ChangeLog:1.5 
pspp/src/language/stats/ChangeLog:1.6
--- pspp/src/language/stats/ChangeLog:1.5       Sat Apr  8 02:44:49 2006
+++ pspp/src/language/stats/ChangeLog   Sun Apr 16 01:05:15 2006
@@ -1,3 +1,7 @@
+Sat Apr 15 18:01:03 2006  Ben Pfaff  <address@hidden>
+
+       * examine.q (output_examine): Add casts to fix warnings.
+
 2006-04-07  Jason Stover  <address@hidden>
 
        * regression.q (subcommand_save): New function.
Index: pspp/src/language/stats/aggregate.c
diff -u pspp/src/language/stats/aggregate.c:1.2 
pspp/src/language/stats/aggregate.c:1.3
--- pspp/src/language/stats/aggregate.c:1.2     Wed Mar 15 03:29:11 2006
+++ pspp/src/language/stats/aggregate.c Sun Apr 16 01:05:15 2006
@@ -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>
Index: pspp/src/language/stats/correlations.q
diff -u pspp/src/language/stats/correlations.q:1.3 
pspp/src/language/stats/correlations.q:1.4
--- pspp/src/language/stats/correlations.q:1.3  Wed Mar 15 03:29:11 2006
+++ pspp/src/language/stats/correlations.q      Sun Apr 16 01:05:15 2006
@@ -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>
Index: pspp/src/language/stats/examine.q
diff -u pspp/src/language/stats/examine.q:1.4 
pspp/src/language/stats/examine.q:1.5
--- pspp/src/language/stats/examine.q:1.4       Mon Apr  3 20:07:54 2006
+++ pspp/src/language/stats/examine.q   Sun Apr 16 01:05:15 2006
@@ -285,12 +285,13 @@
            {
              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 @@
          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 )
Index: pspp/src/language/stats/frequencies.q
diff -u pspp/src/language/stats/frequencies.q:1.4 
pspp/src/language/stats/frequencies.q:1.5
--- pspp/src/language/stats/frequencies.q:1.4   Mon Apr  3 20:07:54 2006
+++ pspp/src/language/stats/frequencies.q       Sun Apr 16 01:05:15 2006
@@ -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)
Index: pspp/src/language/stats/rank.q
diff -u pspp/src/language/stats/rank.q:1.4 pspp/src/language/stats/rank.q:1.5
--- pspp/src/language/stats/rank.q:1.4  Tue Apr  4 12:43:22 2006
+++ pspp/src/language/stats/rank.q      Sun Apr 16 01:05:15 2006
@@ -20,6 +20,7 @@
 
 #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>
Index: pspp/src/language/stats/sort-criteria.h
diff -u pspp/src/language/stats/sort-criteria.h:1.1 
pspp/src/language/stats/sort-criteria.h:1.2
--- pspp/src/language/stats/sort-criteria.h:1.1 Sat Mar  4 01:11:57 2006
+++ pspp/src/language/stats/sort-criteria.h     Sun Apr 16 01:05:15 2006
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 struct variable;
 struct dictionary;
Index: pspp/src/language/tests/moments-test.c
diff -u pspp/src/language/tests/moments-test.c:1.3 
pspp/src/language/tests/moments-test.c:1.4
--- pspp/src/language/tests/moments-test.c:1.3  Tue Apr  4 12:43:22 2006
+++ pspp/src/language/tests/moments-test.c      Sun Apr 16 01:05:15 2006
@@ -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)
 
Index: pspp/src/math/ChangeLog
diff -u pspp/src/math/ChangeLog:1.1 pspp/src/math/ChangeLog:1.2
--- pspp/src/math/ChangeLog:1.1 Sat Mar  4 01:11:57 2006
+++ pspp/src/math/ChangeLog     Sun Apr 16 01:05:15 2006
@@ -1,3 +1,7 @@
+Sat Apr 15 18:01:22 2006  Ben Pfaff  <address@hidden>
+
+       * factor-stats.c (metrics_postcalc): Add casts to fix warnings.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <address@hidden>
        
        * Moved files from src directory
Index: pspp/src/math/factor-stats.c
diff -u pspp/src/math/factor-stats.c:1.2 pspp/src/math/factor-stats.c:1.3
--- pspp/src/math/factor-stats.c:1.2    Wed Mar 15 03:29:11 2006
+++ pspp/src/math/factor-stats.c        Sun Apr 16 01:05:15 2006
@@ -185,9 +185,11 @@
 
 
   /* 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 ) 
Index: pspp/src/math/linreg/ChangeLog
diff -u pspp/src/math/linreg/ChangeLog:1.5 pspp/src/math/linreg/ChangeLog:1.6
--- pspp/src/math/linreg/ChangeLog:1.5  Sun Apr  9 14:03:09 2006
+++ pspp/src/math/linreg/ChangeLog      Sun Apr 16 01:05:15 2006
@@ -1,3 +1,20 @@
+Sat Apr 15 18:03:01 2006  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * linreg.c (pspp_linreg): Move declaration before code for C90
+       compliance.
+
 2006-04-09  Jason Stover  <address@hidden>
 
        * predict.c (pspp_linreg_predict): Do something sensible even with
Index: pspp/src/math/linreg/coefficient.c
diff -u pspp/src/math/linreg/coefficient.c:1.10 
pspp/src/math/linreg/coefficient.c:1.11
--- pspp/src/math/linreg/coefficient.c:1.10     Mon Apr 10 00:25:33 2006
+++ pspp/src/math/linreg/coefficient.c  Sun Apr 16 01:05:15 2006
@@ -196,7 +196,7 @@
     {
       return NULL;
     }
-  if (c->coeff == NULL || c->n_indeps == NULL || v == NULL)
+  if (c->coeff == NULL || c->n_indeps == 0 || v == NULL)
     {
       return NULL;
     }
Index: pspp/src/math/linreg/linreg.h
diff -u pspp/src/math/linreg/linreg.h:1.6 pspp/src/math/linreg/linreg.h:1.7
--- pspp/src/math/linreg/linreg.h:1.6   Sun Apr  9 19:01:11 2006
+++ pspp/src/math/linreg/linreg.h       Sun Apr 16 01:05:15 2006
@@ -191,8 +191,8 @@
 
 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
Index: pspp/src/math/linreg/predict.c
diff -u pspp/src/math/linreg/predict.c:1.5 pspp/src/math/linreg/predict.c:1.6
--- pspp/src/math/linreg/predict.c:1.5  Mon Apr 10 00:25:33 2006
+++ pspp/src/math/linreg/predict.c      Sun Apr 16 01:05:15 2006
@@ -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 @@
 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;
 
Index: pspp/src/math/sort.c
diff -u pspp/src/math/sort.c:1.2 pspp/src/math/sort.c:1.3
--- pspp/src/math/sort.c:1.2    Wed Mar 15 03:29:11 2006
+++ pspp/src/math/sort.c        Sun Apr 16 01:05:15 2006
@@ -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>