#else
-#include <data/casereader-provider.h>
+#include <assert.h>
+#include <stdbool.h>
#include <errno.h>
-#include <libpspp/str.h>
-#include <libpspp/i18n.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
+
#include <xalloc.h>
-#include <errno.h>
#include <libxml/xmlreader.h>
#include <zlib.h>
-#include <stdbool.h>
#include <data/case.h>
+#include <data/casereader-provider.h>
+#include <data/dictionary.h>
+#include <data/identifier.h>
+#include <data/variable.h>
#include <data/value.h>
+#include <libpspp/i18n.h>
+#include <libpspp/str.h>
+
#include "gnumeric-reader.h"
-#include <data/identifier.h>
-#include <assert.h>
/* Default width of string variables. */
#define GNUMERIC_DEFAULT_WIDTH 8
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_)
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;
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)
{
/* 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 )
{