projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Break reading a system file into two stages.
[pspp]
/
src
/
data
/
any-reader.c
diff --git
a/src/data/any-reader.c
b/src/data/any-reader.c
index eaec63da943baaa1fb975749a9f37ac687ff409e..ad3fcb5b7a91a99c6acd22798c459037bc0b22c5 100644
(file)
--- a/
src/data/any-reader.c
+++ b/
src/data/any-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2010, 2011, 2012
, 2014
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-96,7
+96,15
@@
any_reader_open (struct file_handle *handle, const char *encoding,
if (result == ANY_ERROR)
return NULL;
else if (result == ANY_YES)
if (result == ANY_ERROR)
return NULL;
else if (result == ANY_YES)
- return sfm_open_reader (handle, encoding, dict, NULL);
+ {
+ struct sfm_reader *r;
+
+ r = sfm_open (handle);
+ if (r == NULL)
+ return NULL;
+
+ return sfm_decode (r, encoding, dict, NULL);
+ }
result = try_detect (fh_get_file_name (handle), pfm_detect);
if (result == ANY_ERROR)
result = try_detect (fh_get_file_name (handle), pfm_detect);
if (result == ANY_ERROR)