projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "output" into "master"
[pspp-builds.git]
/
src
/
language
/
data-io
/
data-reader.c
diff --git
a/src/language/data-io/data-reader.c
b/src/language/data-io/data-reader.c
index 24ddcf13ec61cf6749c64cd63bfd4e03268cbeea..74e4c5692b1b83a95987bc1e16e7b92aaeebc500 100644
(file)
--- a/
src/language/data-io/data-reader.c
+++ b/
src/language/data-io/data-reader.c
@@
-34,6
+34,7
@@
#include <language/lexer/lexer.h>
#include <language/prompt.h>
#include <libpspp/assertion.h>
#include <language/lexer/lexer.h>
#include <language/prompt.h>
#include <libpspp/assertion.h>
+#include <libpspp/cast.h>
#include <libpspp/integer-format.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/integer-format.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
@@
-140,7
+141,7
@@
dfm_open_reader (struct file_handle *fh, struct lexer *lexer)
if (fh_get_referent (fh) != FH_REF_INLINE)
{
struct stat s;
if (fh_get_referent (fh) != FH_REF_INLINE)
{
struct stat s;
- r->where.file_name =
fh_get_file_name (fh
);
+ r->where.file_name =
CONST_CAST (char *, fh_get_file_name (fh)
);
r->where.line_number = 0;
r->file = fn_open (fh_get_file_name (fh),
fh_get_mode (fh) == FH_MODE_TEXT ? "r" : "rb");
r->where.line_number = 0;
r->file = fn_open (fh_get_file_name (fh),
fh_get_mode (fh) == FH_MODE_TEXT ? "r" : "rb");
@@
-597,7
+598,7
@@
dfm_expand_tabs (struct dfm_reader *r)
}
/* Returns the legacy character encoding of data read from READER. */
}
/* Returns the legacy character encoding of data read from READER. */
-enum legacy_encoding
+const char *
dfm_reader_get_legacy_encoding (const struct dfm_reader *reader)
{
return fh_get_legacy_encoding (reader->fh);
dfm_reader_get_legacy_encoding (const struct dfm_reader *reader)
{
return fh_get_legacy_encoding (reader->fh);