projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e162b9
)
Avoid compiler warnings
author
John Darrington
<john@darrington.wattle.id.au>
Fri, 1 Mar 2013 18:02:49 +0000
(19:02 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Fri, 1 Mar 2013 18:02:49 +0000
(19:02 +0100)
src/data/ods-reader.c
patch
|
blob
|
history
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index 8776a5e2c35e123fb4f30f5a3b0509e6eed71630..ab8b84a44484449e4eefe813c25be9c51c3da8c2 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-268,7
+268,7
@@
process_node (struct ods_reader *r)
r->sheets[r->n_allocated_sheets - 1].stop_col = -1;
r->sheets[r->n_allocated_sheets - 1].start_row = -1;
r->sheets[r->n_allocated_sheets - 1].stop_row = -1;
r->sheets[r->n_allocated_sheets - 1].stop_col = -1;
r->sheets[r->n_allocated_sheets - 1].start_row = -1;
r->sheets[r->n_allocated_sheets - 1].stop_row = -1;
- r->sheets[r->n_allocated_sheets - 1].name =
xmlStrdup (r->current_sheet_name
);
+ r->sheets[r->n_allocated_sheets - 1].name =
CHAR_CAST (char *, xmlStrdup (r->current_sheet_name)
);
}
r->col = 0;
}
r->col = 0;
@@
-441,7
+441,7
@@
convert_xml_to_value (struct ccase *c, const struct variable *var,
if ( 0 == xmlStrcmp (xmv->type, _xml("float")))
{
if ( 0 == xmlStrcmp (xmv->type, _xml("float")))
{
- v->f = c_strtod (
xmv->value
, NULL);
+ v->f = c_strtod (
CHAR_CAST (const char *, xmv->value)
, NULL);
}
else
{
}
else
{
@@
-929,13
+929,14
@@
ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
for (col = 0; col < r->col_span; ++col)
{
for (col = 0; col < r->col_span; ++col)
{
+ const struct variable *var;
const int idx = r->col + col - r->start_col - 1;
if (idx < 0)
continue;
if (r->stop_col != -1 && idx > r->stop_col - r->start_col )
break;
const int idx = r->col + col - r->start_col - 1;
if (idx < 0)
continue;
if (r->stop_col != -1 && idx > r->stop_col - r->start_col )
break;
-
const struct variable *
var = dict_get_var (r->dict, idx);
+
var = dict_get_var (r->dict, idx);
convert_xml_to_value (c, var, xmv);
}
convert_xml_to_value (c, var, xmv);
}