X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fapply-dict.c;h=661628f1244ebfd835db645369c742ad661173ed;hb=6cec94f8545d5895b5bdfa73798b386b453ffa18;hp=9f6867cc4ea3da247a04a677dbd9b8733126edab;hpb=74a57f26f1458b28a0fddbb9f46004ac8f4d9c30;p=pspp

diff --git a/src/apply-dict.c b/src/apply-dict.c
index 9f6867cc4e..661628f124 100644
--- a/src/apply-dict.c
+++ b/src/apply-dict.c
@@ -14,17 +14,18 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <stdlib.h>
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "file-handle.h"
 #include "hash.h"
 #include "lexer.h"
-#include "sfm.h"
+#include "sfm-read.h"
 #include "str.h"
 #include "value-labels.h"
 #include "var.h"
@@ -36,6 +37,7 @@ int
 cmd_apply_dictionary (void)
 {
   struct file_handle *handle;
+  struct sfm_reader *reader;
   struct dictionary *dict;
 
   int n_matched = 0;
@@ -44,13 +46,14 @@ cmd_apply_dictionary (void)
   
   lex_match_id ("FROM");
   lex_match ('=');
-  handle = fh_parse_file_handle ();
+  handle = fh_parse ();
   if (!handle)
     return CMD_FAILURE;
 
-  dict = sfm_read_dictionary (handle, NULL);
+  reader = sfm_open_reader (handle, &dict, NULL);
   if (dict == NULL)
     return CMD_FAILURE;
+  sfm_close_reader (reader);
 
   for (i = 0; i < dict_get_var_cnt (dict); i++)
     {
@@ -170,7 +173,7 @@ cmd_apply_dictionary (void)
         dict_set_weight (default_dict, new_weight);
     }
   
-  sfm_maybe_close (handle);
+  sfm_close_reader (reader);
 
   return lex_end_of_command ();
 }