From 3c6287003e07308c727d9ca13f759bfce33e0693 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 17 Feb 2013 09:14:51 +0100 Subject: [PATCH] Make opts const and remove the feature where it was filled in by the reader --- src/data/gnumeric-reader.c | 9 +++++---- src/data/gnumeric-reader.h | 2 +- src/data/ods-reader.c | 3 ++- src/data/ods-reader.h | 2 +- src/data/spreadsheet-reader.h | 5 ++--- src/language/data-io/get-data.c | 4 +--- src/ui/gui/page-sheet-spec.c | 11 ++++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 201ef599a1..5e4b6978ef 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -208,10 +208,9 @@ process_node (struct gnumeric_reader *r) if (name == NULL) name = xmlStrdup (_xml ("--")); - r->node_type = xmlTextReaderNodeType (r->xtr); - switch ( r->state) + switch (r->state) { case STATE_PRE_INIT: r->current_sheet = -1; @@ -531,7 +530,7 @@ gnumeric_probe (const char *filename, bool report_errors) struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_info *gri, - struct spreadsheet_read_options *opts) + const struct spreadsheet_read_options *opts) { struct gnumeric_reader *r = NULL; unsigned long int vstart = 0; @@ -727,7 +726,8 @@ 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", @@ -736,6 +736,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r->stop_col + 'A' + caseproto_get_n_widths (r->proto), r->start_row + n_cases); } +#endif return casereader_create_sequential (NULL, diff --git a/src/data/gnumeric-reader.h b/src/data/gnumeric-reader.h index a2aaabf7bc..f4c7c38d22 100644 --- a/src/data/gnumeric-reader.h +++ b/src/data/gnumeric-reader.h @@ -34,7 +34,7 @@ void gnumeric_destroy (struct spreadsheet *); struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_info *gri, - struct spreadsheet_read_options *opts); + const struct spreadsheet_read_options *opts); #endif diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c index dd19898c53..fc23c2dbaf 100644 --- a/src/data/ods-reader.c +++ b/src/data/ods-reader.c @@ -419,7 +419,8 @@ struct spreadsheet *ods_probe (const char *filename, bool report_errors) struct casereader * ods_make_reader (struct spreadsheet *spreadsheet, - const struct spreadsheet_read_info *gri, struct spreadsheet_read_options *opts) + const struct spreadsheet_read_info *gri, + const struct spreadsheet_read_options *opts) { intf ret = 0; xmlChar *type = NULL; diff --git a/src/data/ods-reader.h b/src/data/ods-reader.h index f068aa39d7..c602963094 100644 --- a/src/data/ods-reader.h +++ b/src/data/ods-reader.h @@ -27,7 +27,7 @@ struct spreadsheet *ods_probe (const char *filename, bool report_errors); struct casereader * ods_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_info *gri, - struct spreadsheet_read_options *opts); + const struct spreadsheet_read_options *opts); #endif diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h index f6380e31c1..d5d9a5f4c1 100644 --- a/src/data/spreadsheet-reader.h +++ b/src/data/spreadsheet-reader.h @@ -28,12 +28,11 @@ */ struct spreadsheet_read_options { - char *sheet_name ; /* The name of the sheet to open (in UTF-8) */ + const char *sheet_name ; /* The name of the sheet to open (in UTF-8) */ int sheet_index ; /* The index of the sheet to open (only used if sheet_name is NULL) */ - char *cell_range ; /* The cell range (in UTF-8) */ + const char *cell_range ; /* The cell range (in UTF-8) */ }; - struct spreadsheet_read_info { bool read_names ; /* True if the first row is to be used as the names of the variables */ diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index f12261a10f..09251a69c4 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -672,8 +672,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) static void destroy_spreadsheet_read_info (UNUSED struct spreadsheet_read_info *sri, - struct spreadsheet_read_options *opts) + UNUSED struct spreadsheet_read_options *opts) { - free (opts->sheet_name); - free (opts->cell_range); } diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c index b29472761c..9aa16b5925 100644 --- a/src/ui/gui/page-sheet-spec.c +++ b/src/ui/gui/page-sheet-spec.c @@ -87,6 +87,9 @@ char * sheet_spec_gen_syntax (const struct import_assistant *ia) { const struct sheet_spec_page *ssp = ia->sheet_spec; + GtkBuilder *builder = ia->asst.builder; + GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); + const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry)); struct string s = DS_EMPTY_INITIALIZER; @@ -102,11 +105,10 @@ sheet_spec_gen_syntax (const struct import_assistant *ia) ssp->sri.read_names ? "ON" : "OFF"); - if ( ssp->opts.cell_range) + if (range && 0 != strcmp ("", range)) { syntax_gen_pspp (&s, - "\n /CELLRANGE=RANGE %sq", - ssp->opts.cell_range); + "\n /CELLRANGE=RANGE %sq", range); } else { @@ -197,9 +199,8 @@ post_sheet_spec_page (struct import_assistant *ia) struct casereader *creader = NULL; struct dictionary *dict = NULL; - GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox"); - + GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry)); GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry"); -- 2.30.2