scatterplot: fixed compiler warnings

diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index 20dc80255b6fea04dee5856d7913d35f6ea61519..ae80616862f7aeda14e42e49a1b78609ccb860f4 100644 (file)
--- a/src/language/stats/graph.c
+++ b/src/language/stats/graph.c
@@ -131,7 +131,7 @@ struct graph
 
 
 static void
-show_scatterplot (const struct graph *cmd, const struct casereader *input)
+show_scatterplot (const struct graph *cmd, struct casereader *input)
 {
   struct string title;
   struct scatterplot_chart *scatterplot;
@@ -174,11 +174,10 @@ show_scatterplot (const struct graph *cmd, const struct casereader *input)
 }
 
 static void
-show_histogr (const struct graph *cmd, const struct casereader *input)
+show_histogr (const struct graph *cmd, struct casereader *input)
 {
   struct histogram *histogram;
   struct ccase *c;
-  struct casereader *reader;
 
   {
     /* Sturges Rule */
@@ -237,7 +236,8 @@ static void
 run_graph (struct graph *cmd, struct casereader *input)
 {
   struct ccase *c;
-  struct casereader *reader, *writer;
+  struct casereader *reader;
+  struct casewriter *writer;
 
   cmd->es = pool_calloc (cmd->pool,cmd->n_dep_vars,sizeof(struct exploratory_stats));
   for(int v=0;v<cmd->n_dep_vars;v++)

diff --git a/src/output/charts/scatterplot.c b/src/output/charts/scatterplot.c
index 2c3ffd683f23c7aa1e8d70ca7c7d9e73b8194b8c..5073a5a71b7e5e5b600905b2f97edafd9d82b5dc 100644 (file)
--- a/src/output/charts/scatterplot.c
+++ b/src/output/charts/scatterplot.c
@@ -21,6 +21,7 @@
 #include <gsl/gsl_cdf.h>
 
 #include "data/casereader.h"
+#include "data/variable.h"
 #include "libpspp/cast.h"
 #include "output/chart-item-provider.h"
 
@@ -28,7 +29,7 @@
 
 /* Creates a scatterplot */
 struct scatterplot_chart *
-scatterplot_create (const struct casereader *reader, 
+scatterplot_create (struct casereader *reader,
                    const char *xlabel,
                    const char *ylabel,
                    const struct variable *byvar,

diff --git a/src/output/charts/scatterplot.h b/src/output/charts/scatterplot.h
index b752b7471f788003fdabf6c7512656c0565949db..a78227dabc622badc9c8c765a328fffb63652d92 100644 (file)
--- a/src/output/charts/scatterplot.h
+++ b/src/output/charts/scatterplot.h
@@ -32,9 +32,9 @@ struct scatterplot_chart
   {
     struct chart_item chart_item;
     struct casereader *data;
-    const struct variable *byvar;
-    const char *xlabel;
-    const char *ylabel;
+    struct variable *byvar;
+    char *xlabel;
+    char *ylabel;
 
     double y_min, y_max;
     double x_min, x_max;
@@ -45,7 +45,7 @@ struct scatterplot_chart
   };
 
 struct scatterplot_chart *
-scatterplot_create (const struct casereader *, 
+scatterplot_create (struct casereader *,
                    const char *xlabel,
                    const char *ylabel,
                    const struct variable *,