X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fany-reader.c;h=0ab6dc23fd4786e091d295b5e7c66331d3e4d53a;hb=945fd370f9fb880b310fb88f868ad47c2ae84533;hp=876d7fa56b4059ad1028d1ed0783b63d8e9230da;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/data/any-reader.c b/src/data/any-reader.c
index 876d7fa5..0ab6dc23 100644
--- a/src/data/any-reader.c
+++ b/src/data/any-reader.c
@@ -24,12 +24,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "message.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 "str.h"
+#include <libpspp/str.h>
 #include "scratch-reader.h"
 #include "xalloc.h"
 
@@ -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;
       }
 
@@ -204,4 +204,6 @@ any_reader_close (struct any_reader *reader)
     default:
       abort ();
     }
+
+  free (reader);
 }