projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate quoting style in printed strings.
[pspp]
/
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 6f620a6a948341a0dfa5db150763d20f51e92284..e9bcbfa9dc38d6a77aaffc9ee0b7a06476d28bb9 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,13
+141,12
@@
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->where.line_number = 0;
- r->file = fn_open (fh_get_file_name (fh),
- fh_get_mode (fh) == FH_MODE_TEXT ? "r" : "rb");
+ r->file = fn_open (fh_get_file_name (fh), "rb");
if (r->file == NULL)
{
if (r->file == NULL)
{
- msg (ME, _("Could not open
\"%s\"
for reading as a data file: %s."),
+ msg (ME, _("Could not open
`%s'
for reading as a data file: %s."),
fh_get_file_name (r->fh), strerror (errno));
fh_unlock (r->lock);
fh_unref (fh);
fh_get_file_name (r->fh), strerror (errno));
fh_unlock (r->lock);
fh_unref (fh);