projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed error running 'make distcheck'
[pspp]
/
src
/
data
/
spreadsheet-reader.c
diff --git
a/src/data/spreadsheet-reader.c
b/src/data/spreadsheet-reader.c
index 02e5c2d3c04b18e3cc38dcce5359ac9fbbada59d..9cd118c758673b93eb89687124f1b95d96954f01 100644
(file)
--- a/
src/data/spreadsheet-reader.c
+++ b/
src/data/spreadsheet-reader.c
@@
-29,17
+29,23
@@
#include <gl/c-xvasprintf.h>
#include <stdlib.h>
#include <gl/c-xvasprintf.h>
#include <stdlib.h>
+void
+spreadsheet_ref (struct spreadsheet *s)
+{
+ s->ref_cnt++;
+}
-void
-spreadsheet_
destroy
(struct spreadsheet *s)
+void
+spreadsheet_
unref
(struct spreadsheet *s)
{
switch (s->type)
{
case SPREADSHEET_ODS:
{
switch (s->type)
{
case SPREADSHEET_ODS:
- ods_
destroy
(s);
+ ods_
unref
(s);
break;
break;
+
case SPREADSHEET_GNUMERIC:
case SPREADSHEET_GNUMERIC:
- gnumeric_
destroy
(s);
+ gnumeric_
unref
(s);
break;
default:
NOT_REACHED ();
break;
default:
NOT_REACHED ();
@@
-48,36
+54,39
@@
spreadsheet_destroy (struct spreadsheet *s)
}
}
-struct casereader *
-spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+struct casereader *
+spreadsheet_make_reader (struct spreadsheet *s,
+ const struct spreadsheet_read_options *opts)
{
{
- if (
s->type == SPREADSHEET_ODS)
+ if (s->type == SPREADSHEET_ODS)
return ods_make_reader (s, opts);
return ods_make_reader (s, opts);
- if ( s->type == SPREADSHEET_GNUMERIC)
+
+ if (s->type == SPREADSHEET_GNUMERIC)
return gnumeric_make_reader (s, opts);
return NULL;
}
return gnumeric_make_reader (s, opts);
return NULL;
}
-const char *
+const char *
spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
{
spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
{
- if (
s->type == SPREADSHEET_ODS)
+ if (s->type == SPREADSHEET_ODS)
return ods_get_sheet_name (s, n);
return ods_get_sheet_name (s, n);
- if (
s->type == SPREADSHEET_GNUMERIC)
+ if (s->type == SPREADSHEET_GNUMERIC)
return gnumeric_get_sheet_name (s, n);
return NULL;
}
return gnumeric_get_sheet_name (s, n);
return NULL;
}
-char *
+
+char *
spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
{
spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
{
- if (
s->type == SPREADSHEET_ODS)
+ if (s->type == SPREADSHEET_ODS)
return ods_get_sheet_range (s, n);
return ods_get_sheet_range (s, n);
- if (
s->type == SPREADSHEET_GNUMERIC)
+ if (s->type == SPREADSHEET_GNUMERIC)
return gnumeric_get_sheet_range (s, n);
return NULL;
return gnumeric_get_sheet_range (s, n);
return NULL;
@@
-145,7
+154,7
@@
int_to_ps26 (int i)
while (i > lower + base - 1)
{
lower += base;
while (i > lower + base - 1)
{
lower += base;
- base *= RADIX;
+ base *= RADIX;
assert (base > 0);
exp++;
}
assert (base > 0);
exp++;
}
@@
-176,8
+185,8
@@
create_cell_ref (int col0, int row0)
char *cs0 ;
char *s ;
char *cs0 ;
char *s ;
- if (
col0 < 0) return NULL;
- if (
row0 < 0) return NULL;
+ if (col0 < 0) return NULL;
+ if (row0 < 0) return NULL;
cs0 = int_to_ps26 (col0);
s = c_xasprintf ("%s%d", cs0, row0 + 1);
cs0 = int_to_ps26 (col0);
s = c_xasprintf ("%s%d", cs0, row0 + 1);
@@
-220,7
+229,7
@@
convert_cell_ref (const char *ref,
int n = sscanf (ref, "%4[a-zA-Z]%d:%4[a-zA-Z]%d",
startcol, &startrow,
stopcol, &stoprow);
int n = sscanf (ref, "%4[a-zA-Z]%d:%4[a-zA-Z]%d",
startcol, &startrow,
stopcol, &stoprow);
- if (
n != 4)
+ if (n != 4)
return false;
str_uppercase (startcol);
return false;
str_uppercase (startcol);