projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Add framework for n sample independent variable tests.
[pspp]
/
src
/
data
/
gnumeric-reader.c
diff --git
a/src/data/gnumeric-reader.c
b/src/data/gnumeric-reader.c
index 74911c469ea902a916f8b87ab2fd29a20dc425a6..26b90ee8916377d500512b1145422bff1fd9a1d1 100644
(file)
--- a/
src/data/gnumeric-reader.c
+++ b/
src/data/gnumeric-reader.c
@@
-181,9
+181,9
@@
struct gnumeric_reader
static void process_node (struct gnumeric_reader *r);
static void process_node (struct gnumeric_reader *r);
-#define _xml(X) (
const xmlChar *)(X
)
+#define _xml(X) (
CHAR_CAST (const xmlChar *, X)
)
-#define _xmlchar_to_int(X)
atoi((const char *)X
)
+#define _xmlchar_to_int(X)
(atoi(CHAR_CAST (const char *, X))
)
static void
gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
static void
gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
@@
-328,7
+328,7
@@
convert_xml_string_to_value (struct ccase *c, const struct variable *var,
value_copy_str_rpad (v, var_get_width (var), xv, ' ');
else
{
value_copy_str_rpad (v, var_get_width (var), xv, ' ');
else
{
- const char *text =
(const char *) xv
;
+ const char *text =
CHAR_CAST (const char *, xv)
;
char *endptr;
errno = 0;
char *endptr;
errno = 0;
@@
-361,7
+361,7
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
if ( NULL == gz)
{
if ( NULL == gz)
{
- msg (ME, _("Error opening
\"%s\"
for reading as a Gnumeric file: %s."),
+ msg (ME, _("Error opening
`%s'
for reading as a Gnumeric file: %s."),
gri->file_name, strerror (errno));
goto error;
gri->file_name, strerror (errno));
goto error;
@@
-381,7
+381,7
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
&r->start_col, &r->start_row,
&r->stop_col, &r->stop_row))
{
&r->start_col, &r->start_row,
&r->stop_col, &r->stop_row))
{
- msg (SE, _("Invalid cell range
\"%s\"
"),
+ msg (SE, _("Invalid cell range
`%s'
"),
gri->cell_range);
goto error;
}
gri->cell_range);
goto error;
}
@@
-459,7
+459,7
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
if ( r->node_type == XML_READER_TYPE_TEXT )
{
xmlChar *value = xmlTextReaderValue (r->xtr);
if ( r->node_type == XML_READER_TYPE_TEXT )
{
xmlChar *value = xmlTextReaderValue (r->xtr);
- const char *text =
(const char *) value
;
+ const char *text =
CHAR_CAST (const char *, value)
;
if ( r->row < r->start_row)
{
if ( r->row < r->start_row)
{
@@
-499,7
+499,7
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
/* Create the dictionary and populate it */
*dict = r->dict = dict_create ();
/* Create the dictionary and populate it */
*dict = r->dict = dict_create ();
- dict_set_encoding (r->dict,
(const char *) xmlTextReaderConstEncoding (r->xtr
));
+ dict_set_encoding (r->dict,
CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->xtr)
));
for (i = 0 ; i < n_var_specs ; ++i )
{
for (i = 0 ; i < n_var_specs ; ++i )
{
@@
-525,7
+525,7
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
if ( n_var_specs == 0 )
{
if ( n_var_specs == 0 )
{
- msg (MW, _("Selected sheet or range of spreadsheet
\"%s\"
is empty."),
+ msg (MW, _("Selected sheet or range of spreadsheet
`%s'
is empty."),
gri->file_name);
goto error;
}
gri->file_name);
goto error;
}