X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.h;h=37b249d4e9c4af6c4884ac7b7da8b2d4259e6b53;hb=ccaf88efae9f6f4d93d7812834c412e8fd511bb2;hp=c03cf71642135f0ef12331e247a4fe44d58fb9a7;hpb=df2866a475d36298a14cc1e97c6118e088ac85da;p=pspp diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h index c03cf71642..37b249d4e9 100644 --- a/src/data/spreadsheet-reader.h +++ b/src/data/spreadsheet-reader.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2010, 2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ #define SPREADSHEET_READ_H 1 #include +#include struct casereeader; @@ -66,8 +67,9 @@ struct spreadsheet /* The total number of sheets in the "workbook" */ int n_sheets; - /* The dictionary */ - struct dictionary *dict; + /* The dictionary for client's reference. + Client must clone if it needs a permanent or modifiable copy. */ + const struct dictionary *dict; int ref_cnt; }; @@ -75,8 +77,8 @@ struct spreadsheet struct casereader * spreadsheet_make_reader (struct spreadsheet *, const struct spreadsheet_read_options *); -const char * spreadsheet_get_sheet_name (struct spreadsheet *s, int n); -char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n); +const char * spreadsheet_get_sheet_name (struct spreadsheet *s, int n) OPTIMIZE(2); +char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n) OPTIMIZE(2); char * create_cell_ref (int col0, int row0);