X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fany-reader.c;h=1c1b519b2dce7c289d8cb11d340582cbc199dcf3;hb=edf539fc797fedcdf7a71894f707d3c9728335d6;hp=64f881e3e124e2d382ffe0fed927b1bb3c291d88;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git diff --git a/src/data/any-reader.c b/src/data/any-reader.c index 64f881e3..1c1b519b 100644 --- a/src/data/any-reader.c +++ b/src/data/any-reader.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "any-reader.h" @@ -24,9 +21,10 @@ #include #include #include +#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 @@ -36,23 +34,8 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -/* Type of file backing an any_reader. */ -enum any_reader_type - { - SYSTEM_FILE, /* System file. */ - PORTABLE_FILE, /* Portable file. */ - SCRATCH_FILE /* Scratch file. */ - }; - -/* Reader for any type of case-structured file. */ -struct any_reader - { - enum any_reader_type type; /* Type of file. */ - void *private; /* Private data. */ - }; - /* Result of type detection. */ -enum detect_result +enum detect_result { YES, /* It is this type. */ NO, /* It is not this type. */ @@ -68,45 +51,28 @@ 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); - return is_type ? YES : NO; -} + fn_close (fh_get_file_name (handle), file); -/* If PRIVATE is non-null, creates and returns a new any_reader, - initializing its fields to TYPE and PRIVATE. If PRIVATE is a - null pointer, just returns a null pointer. */ -static struct any_reader * -make_any_reader (enum any_reader_type type, void *private) -{ - if (private != NULL) - { - struct any_reader *reader = xmalloc (sizeof *reader); - reader->type = type; - reader->private = private; - return reader; - } - else - return NULL; + return is_type ? YES : NO; } -/* Creates an any_reader for HANDLE. On success, returns the new - any_reader and stores the file's dictionary into *DICT. On +/* Returns a casereader for HANDLE. On success, returns the new + casereader and stores the file's dictionary into *DICT. On failure, returns a null pointer. */ -struct any_reader * +struct casereader * any_reader_open (struct file_handle *handle, struct dictionary **dict) { - switch (fh_get_referent (handle)) + switch (fh_get_referent (handle)) { case FH_REF_FILE: { @@ -116,18 +82,16 @@ any_reader_open (struct file_handle *handle, struct dictionary **dict) if (result == IO_ERROR) return NULL; else if (result == YES) - return make_any_reader (SYSTEM_FILE, - sfm_open_reader (handle, dict, NULL)); + return sfm_open_reader (handle, dict, NULL); result = try_detect (handle, pfm_detect); if (result == IO_ERROR) return NULL; else if (result == YES) - return make_any_reader (PORTABLE_FILE, - pfm_open_reader (handle, dict, NULL)); + return 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; } @@ -136,72 +100,7 @@ any_reader_open (struct file_handle *handle, struct dictionary **dict) return NULL; case FH_REF_SCRATCH: - return make_any_reader (SCRATCH_FILE, - scratch_reader_open (handle, dict)); - } - abort (); -} - -/* Reads a single case from READER into C. - Returns true if successful, false at end of file or on error. */ -bool -any_reader_read (struct any_reader *reader, struct ccase *c) -{ - switch (reader->type) - { - case SYSTEM_FILE: - return sfm_read_case (reader->private, c); - - case PORTABLE_FILE: - return pfm_read_case (reader->private, c); - - case SCRATCH_FILE: - return scratch_reader_read_case (reader->private, c); - } - abort (); -} - -/* Returns true if an I/O error has occurred on READER, false - otherwise. */ -bool -any_reader_error (struct any_reader *reader) -{ - switch (reader->type) - { - case SYSTEM_FILE: - return sfm_read_error (reader->private); - - case PORTABLE_FILE: - return pfm_read_error (reader->private); - - case SCRATCH_FILE: - return scratch_reader_error (reader->private); - } - abort (); -} - -/* Closes READER. */ -void -any_reader_close (struct any_reader *reader) -{ - if (reader == NULL) - return; - - switch (reader->type) - { - case SYSTEM_FILE: - sfm_close_reader (reader->private); - break; - - case PORTABLE_FILE: - pfm_close_reader (reader->private); - break; - - case SCRATCH_FILE: - scratch_reader_close (reader->private); - break; - - default: - abort (); + return scratch_reader_open (handle, dict); } + NOT_REACHED (); }