X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fany-reader.c;h=0ab6dc23fd4786e091d295b5e7c66331d3e4d53a;hb=83141cdd4ab281da80d5dfeda05073f0cb354eab;hp=df37c8ea470afb8f8be68fbf028d50854cc96f2f;hpb=ac6051350fba373c6f72ad44deded2b5b0e31ca0;p=pspp diff --git a/src/data/any-reader.c b/src/data/any-reader.c index df37c8ea47..0ab6dc23fd 100644 --- a/src/data/any-reader.c +++ b/src/data/any-reader.c @@ -26,7 +26,7 @@ #include #include #include "file-handle-def.h" -#include "filename.h" +#include "file-name.h" #include "por-file-reader.h" #include "sys-file-reader.h" #include @@ -68,17 +68,17 @@ try_detect (struct file_handle *handle, bool (*detect) (FILE *)) 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."), - fh_get_filename (handle), strerror (errno)); + fh_get_file_name (handle), strerror (errno)); 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; } @@ -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."), - fh_get_filename (handle)); + fh_get_file_name (handle)); return NULL; }