projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
data
/
sys-file-reader.h
diff --git
a/src/data/sys-file-reader.h
b/src/data/sys-file-reader.h
index 92a304829ca827b12dca5fb7bf8989cffa723ad3..242857494ee365af5238936bdd8c7e2027c30c0a 100644
(file)
--- a/
src/data/sys-file-reader.h
+++ b/
src/data/sys-file-reader.h
@@
-1,21
+1,18
@@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009 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 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
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
#ifndef SFM_READ_H
#define SFM_READ_H 1
#ifndef SFM_READ_H
#define SFM_READ_H 1
@@
-23,6
+20,7
@@
#include <stdbool.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
+#include <data/case.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
@@
-36,19
+34,22
@@
struct sfm_read_info
enum integer_format integer_format;
enum float_format float_format;
bool compressed; /* 0=no, 1=yes. */
enum integer_format integer_format;
enum float_format float_format;
bool compressed; /* 0=no, 1=yes. */
-
int case_cnt;
/* -1 if unknown. */
+
casenumber case_cnt;
/* -1 if unknown. */
char product[61]; /* Product name plus a null. */
char product[61]; /* Product name plus a null. */
+
+ /* Writer's version number in X.Y.Z format.
+ The version number is not always present; if not, then
+ all of these are set to 0. */
+ int version_major; /* X. */
+ int version_minor; /* Y. */
+ int version_revision; /* Z. */
};
struct dictionary;
struct file_handle;
};
struct dictionary;
struct file_handle;
-struct ccase;
-struct sfm_reader *sfm_open_reader (struct file_handle *,
+struct casereader *sfm_open_reader (struct file_handle *,
struct dictionary **,
struct sfm_read_info *);
struct dictionary **,
struct sfm_read_info *);
-int sfm_read_case (struct sfm_reader *, struct ccase *);
-bool sfm_read_error (const struct sfm_reader *);
-void sfm_close_reader (struct sfm_reader *);
bool sfm_detect (FILE *);
#endif /* sys-file-reader.h */
bool sfm_detect (FILE *);
#endif /* sys-file-reader.h */