From 6f70270e681668a1b9fa3430866b82baa2c684e2 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 11 Mar 2013 21:54:20 -0700
Subject: [PATCH] Fix warnings introduced by minor type errors in recently
 added code.

---
 src/data/gnumeric-reader.c    | 4 ++--
 src/data/ods-reader.c         | 4 ++--
 src/ui/gui/spreadsheet-test.c | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 71dc4a1be7..1b7a646a83 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -138,7 +138,7 @@ struct gnumeric_reader
 void
 gnumeric_destroy (struct spreadsheet *s)
 {
-  struct gnumeric_reader *r = s;
+  struct gnumeric_reader *r = (struct gnumeric_reader *) s;
 
   if (0 == --r->ref_cnt)
     {
@@ -211,7 +211,7 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 
   caseproto_unref (r->proto);
 
-  gnumeric_destroy (r);
+  gnumeric_destroy (&r->spreadsheet);
 }
 
 
diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 5306691c6c..b3586b82ec 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -140,7 +140,7 @@ struct ods_reader
 void
 ods_destroy (struct spreadsheet *s)
 {
-  struct ods_reader *r = s;
+  struct ods_reader *r = (struct ods_reader *) s;
 
   if (--r->ref_cnt == 0)
     {
@@ -252,7 +252,7 @@ ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
   xmlFree (r->current_sheet_name);
   xmlFree (r->target_sheet_name);
 
-  ods_destroy (r);
+  ods_destroy (&r->spreadsheet);
 }
 
 
diff --git a/src/ui/gui/spreadsheet-test.c b/src/ui/gui/spreadsheet-test.c
index 90a10375ec..2f1680409a 100644
--- a/src/ui/gui/spreadsheet-test.c
+++ b/src/ui/gui/spreadsheet-test.c
@@ -52,7 +52,8 @@ on_clicked (GtkButton *button, struct xxx *stuff)
 
   opts.sheet_index = -1;
   opts.cell_range = spreadsheet_get_sheet_range (stuff->sp, x);
-  opts.sheet_name = spreadsheet_get_sheet_name (stuff->sp, x);
+  opts.sheet_name = CONST_CAST (char *,
+                                spreadsheet_get_sheet_name (stuff->sp, x));
   opts.read_names = TRUE;
   opts.asw = -1;
 
@@ -78,7 +79,7 @@ on_clicked (GtkButton *button, struct xxx *stuff)
 	else
 	  {
 	    char *ss = xzalloc (width + 1);
-	    strncpy (ss, value_str (val, width), width);
+            memcpy (ss, value_str (val, width), width);
 	    
 	    printf ("%s ", ss);
 	    free (ss);
-- 
2.30.2