From 3a8a8c31c485e4471d39482bc43fe5f08d8c6a0e Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 17 Feb 2013 09:17:23 +0100 Subject: [PATCH] Fixed some more warnings --- src/data/gnumeric-reader.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 5e4b6978ef..6cb620d8f9 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -28,8 +28,6 @@ #include "spreadsheet-reader.h" -#include "c-xvasprintf.h" - #if !GNM_SUPPORT struct casereader * @@ -532,6 +530,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_info *gri, const struct spreadsheet_read_options *opts) { + int x = 0; struct gnumeric_reader *r = NULL; unsigned long int vstart = 0; int ret; @@ -706,13 +705,15 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r->first_case = case_create (r->proto); case_set_missing (r->first_case); - int x = 0; + for ( i = 0 ; i < n_var_specs ; ++i ) { + const struct variable *var; + if ( (var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) continue; - const struct variable *var = dict_get_var (r->dict, x++); + var = dict_get_var (r->dict, x++); convert_xml_string_to_value (r->first_case, var, var_spec[i].first_value); @@ -727,17 +728,6 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, free (var_spec); -#if 0 - if (opts->cell_range == NULL) - { - opts->cell_range = c_xasprintf ("%c%d:%c%ld", - r->start_col + 'A', - r->start_row, - r->stop_col + 'A' + caseproto_get_n_widths (r->proto), - r->start_row + n_cases); - } -#endif - return casereader_create_sequential (NULL, r->proto, -- 2.30.2