scatterplot: fixed compiler warnings

[pspp] / src / language / stats / graph.c

diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index 54d47d40fa1156e892989dc188e8e83761b26796..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;
@@ -142,15 +142,15 @@ show_scatterplot (const struct graph *cmd, const struct casereader *input)
   if (cmd->byvar)
     {
       ds_put_format (&title, _("%s vs. %s by %s"),
-                          var_to_string (cmd->dep_vars[0]),
                           var_to_string (cmd->dep_vars[1]),
+                          var_to_string (cmd->dep_vars[0]),
                           var_to_string (cmd->byvar));
     }
   else
     {
       ds_put_format (&title, _("%s vs. %s"),
-                    var_to_string (cmd->dep_vars[0]),
-                    var_to_string (cmd->dep_vars[1]));
+                    var_to_string (cmd->dep_vars[1]),
+                    var_to_string (cmd->dep_vars[0]));
     }
                 
 
@@ -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++)