projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjustments for making coeff a pspp_linreg_coeff**
[pspp-builds.git]
/
src
/
data
/
any-reader.c
diff --git
a/src/data/any-reader.c
b/src/data/any-reader.c
index df37c8ea470afb8f8be68fbf028d50854cc96f2f..0ab6dc23fd4786e091d295b5e7c66331d3e4d53a 100644
(file)
--- a/
src/data/any-reader.c
+++ b/
src/data/any-reader.c
@@
-26,7
+26,7
@@
#include <stdlib.h>
#include <libpspp/message.h>
#include "file-handle-def.h"
#include <stdlib.h>
#include <libpspp/message.h>
#include "file-handle-def.h"
-#include "filename.h"
+#include "file
-
name.h"
#include "por-file-reader.h"
#include "sys-file-reader.h"
#include <libpspp/str.h>
#include "por-file-reader.h"
#include "sys-file-reader.h"
#include <libpspp/str.h>
@@
-68,17
+68,17
@@
try_detect (struct file_handle *handle, bool (*detect) (FILE *))
FILE *file;
bool is_type;
FILE *file;
bool is_type;
- file = fn_open (fh_get_filename (handle), "rb");
+ file = fn_open (fh_get_file
_
name (handle), "rb");
if (file == NULL)
{
msg (ME, _("An error occurred while opening \"%s\": %s."),
if (file == NULL)
{
msg (ME, _("An error occurred while opening \"%s\": %s."),
- fh_get_filename (handle), strerror (errno));
+ fh_get_file
_
name (handle), strerror (errno));
return IO_ERROR;
}
is_type = detect (file);
return IO_ERROR;
}
is_type = detect (file);
- fn_close (fh_get_filename (handle), file);
+ fn_close (fh_get_file
_
name (handle), file);
return is_type ? YES : NO;
}
return is_type ? YES : NO;
}
@@
-127,7
+127,7
@@
any_reader_open (struct file_handle *handle, struct dictionary **dict)
pfm_open_reader (handle, dict, NULL));
msg (SE, _("\"%s\" is not a system or portable file."),
pfm_open_reader (handle, dict, NULL));
msg (SE, _("\"%s\" is not a system or portable file."),
- fh_get_filename (handle));
+ fh_get_file
_
name (handle));
return NULL;
}
return NULL;
}