projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace "sed" with "$(SED)" in Makefiles
[pspp]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 8718a5f940ba9d96acca418c4b2fbbeb787a9048..a1193de767dc4618d4a8a1bdf1b0e6f6d5e33341 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-408,7
+408,7
@@
sfm_open (struct file_handle *fh)
if (r->lock == NULL)
goto error;
if (r->lock == NULL)
goto error;
- r->file = fn_open (fh
_get_file_name (fh)
, "rb");
+ r->file = fn_open (fh, "rb");
if (r->file == NULL)
{
msg (ME, _("Error opening `%s' for reading as a system file: %s."),
if (r->file == NULL)
{
msg (ME, _("Error opening `%s' for reading as a system file: %s."),
@@
-537,7
+537,7
@@
read_record (struct sfm_reader *r, int type,
/* Returns the character encoding obtained from R, or a null pointer if R
doesn't have an indication of its character encoding. */
/* Returns the character encoding obtained from R, or a null pointer if R
doesn't have an indication of its character encoding. */
-const char *
+
static
const char *
sfm_get_encoding (const struct sfm_reader *r)
{
/* The EXT_ENCODING record is the best way to determine dictionary
sfm_get_encoding (const struct sfm_reader *r)
{
/* The EXT_ENCODING record is the best way to determine dictionary
@@
-894,7
+894,7
@@
sfm_close (struct any_reader *r_)
if (r->file)
{
if (r->file)
{
- if (fn_close (
fh_get_file_name (r->fh)
, r->file) == EOF)
+ if (fn_close (
r->fh
, r->file) == EOF)
{
msg (ME, _("Error closing system file `%s': %s."),
fh_get_file_name (r->fh), strerror (errno));
{
msg (ME, _("Error closing system file `%s': %s."),
fh_get_file_name (r->fh), strerror (errno));
@@
-921,9
+921,8
@@
sys_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
sfm_close (&r->any_reader);
}
sfm_close (&r->any_reader);
}
-/* Returns 1 if FILE is an SPSS system file,
- 0 if it is not,
- otherwise a negative errno value. */
+/* Detects whether FILE is an SPSS system file. Returns 1 if so, 0 if not, and
+ a negative errno value if there is an error reading FILE. */
static int
sfm_detect (FILE *file)
{
static int
sfm_detect (FILE *file)
{
@@
-932,7
+931,7
@@
sfm_detect (FILE *file)
if (fseek (file, 0, SEEK_SET) != 0)
return -errno;
if (fread (magic, 4, 1, file) != 1)
if (fseek (file, 0, SEEK_SET) != 0)
return -errno;
if (fread (magic, 4, 1, file) != 1)
- return fe
of (file) ? 0 : -errno
;
+ return fe
rror (file) ? -errno : 0
;
magic[4] = '\0';
return (!strcmp (ASCII_MAGIC, magic)
magic[4] = '\0';
return (!strcmp (ASCII_MAGIC, magic)