projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Avoid using \b in sed regular expressions.
[pspp]
/
src
/
data
/
sys-file-reader.h
diff --git
a/src/data/sys-file-reader.h
b/src/data/sys-file-reader.h
index 24c3f8467f642575d9bd0b854e65570f91b45b5d..011d541954841afebac874bc9820bfc4d3766529 100644
(file)
--- a/
src/data/sys-file-reader.h
+++ b/
src/data/sys-file-reader.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2011
, 2012, 2013
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
@@
-21,21
+21,26
@@
#include <stdio.h>
#include "data/case.h"
#include <stdio.h>
#include "data/case.h"
+#include "data/sys-file.h"
#include "libpspp/float-format.h"
#include "libpspp/integer-format.h"
/* Reading system files. */
#include "libpspp/float-format.h"
#include "libpspp/integer-format.h"
/* Reading system files. */
-/* System file info that doesn't fit in struct dictionary. */
+/* System file info that doesn't fit in struct dictionary.
+
+ The strings in this structure are encoded in UTF-8. (They are normally in
+ the ASCII subset of UTF-8.) */
struct sfm_read_info
{
struct sfm_read_info
{
- char
creation_date[10]; /* `dd mmm yy' plus a null
. */
- char
creation_time[9]; /* `hh:mm:ss' plus a null
. */
+ char
*creation_date; /* "dd mmm yy"
. */
+ char
*creation_time; /* "hh:mm:ss"
. */
enum integer_format integer_format;
enum float_format float_format;
enum integer_format integer_format;
enum float_format float_format;
- bool compressed; /* 0=no, 1=yes. */
+ enum sfm_compression compression;
casenumber case_cnt; /* -1 if unknown. */
casenumber case_cnt; /* -1 if unknown. */
- char product[61]; /* Product name, as ASCII string. */
+ char *product; /* Product name. */
+ char *product_ext; /* Extra product info. */
/* Writer's version number in X.Y.Z format.
The version number is not always present; if not, then
/* Writer's version number in X.Y.Z format.
The version number is not always present; if not, then
@@
-45,9
+50,11
@@
struct sfm_read_info
int version_revision; /* Z. */
};
int version_revision; /* Z. */
};
+void sfm_read_info_destroy (struct sfm_read_info *);
+
struct dictionary;
struct file_handle;
struct dictionary;
struct file_handle;
-struct casereader *sfm_open_reader (struct file_handle *,
+struct casereader *sfm_open_reader (struct file_handle *,
const char *encoding,
struct dictionary **,
struct sfm_read_info *);
bool sfm_detect (FILE *);
struct dictionary **,
struct sfm_read_info *);
bool sfm_detect (FILE *);