projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up file handle code in preparation to add temporary file
[pspp]
/
src
/
vfm.h
diff --git
a/src/vfm.h
b/src/vfm.h
index 9b577ed8abbb7bf58c99292a13ba46c9dc447cd1..d72568ce8e1eaf3c33daccba7fd53bf86a1a6ca1 100644
(file)
--- a/
src/vfm.h
+++ b/
src/vfm.h
@@
-14,17
+14,14
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#if !vfm_h
#define vfm_h 1
#include <time.h>
#if !vfm_h
#define vfm_h 1
#include <time.h>
-/* This is the time at which vfm was last invoked. */
-extern time_t last_vfm_invocation;
-
struct ccase;
typedef struct write_case_data *write_case_data;
typedef int write_case_func (write_case_data);
struct ccase;
typedef struct write_case_data *write_case_data;
typedef int write_case_func (write_case_data);
@@
-36,7
+33,6
@@
extern struct case_source *vfm_source;
struct case_source
{
const struct case_source_class *class; /* Class. */
struct case_source
{
const struct case_source_class *class; /* Class. */
- size_t value_cnt; /* Number of `union value's in case. */
void *aux; /* Auxiliary data. */
};
void *aux; /* Auxiliary data. */
};
@@
-69,7
+65,6
@@
extern const struct case_source_class sort_source_class;
struct dictionary;
struct case_source *create_case_source (const struct case_source_class *,
struct dictionary;
struct case_source *create_case_source (const struct case_source_class *,
- const struct dictionary *,
void *);
void free_case_source (struct case_source *);
void *);
void free_case_source (struct case_source *);
@@
-78,8
+73,7
@@
int case_source_is_class (const struct case_source *,
const struct case_source_class *);
struct casefile *storage_source_get_casefile (struct case_source *);
const struct case_source_class *);
struct casefile *storage_source_get_casefile (struct case_source *);
-struct case_source *storage_source_create (struct casefile *,
- const struct dictionary *);
+struct case_source *storage_source_create (struct casefile *);
\f
/* The replacement active file, to which cases are written. */
extern struct case_sink *vfm_sink;
\f
/* The replacement active file, to which cases are written. */
extern struct case_sink *vfm_sink;
@@
-89,11
+83,6
@@
struct case_sink
{
const struct case_sink_class *class; /* Class. */
void *aux; /* Auxiliary data. */
{
const struct case_sink_class *class; /* Class. */
void *aux; /* Auxiliary data. */
-
- /* Cases written to a case sink belong to a dictionary, but
- their data is compacted to drop scratch variables. */
- const struct dictionary *dict; /* Dictionary for cases. */
- int *idx_to_fv; /* `dict' index -> case `data' index. */
size_t value_cnt; /* Number of `union value's in case. */
};
size_t value_cnt; /* Number of `union value's in case. */
};
@@
-142,5
+131,7
@@
struct ccase *lagged_case (int n_before);
void multipass_procedure_with_splits (void (*) (const struct casefile *,
void *),
void *aux);
void multipass_procedure_with_splits (void (*) (const struct casefile *,
void *),
void *aux);
+
\f
+time_t vfm_last_invocation (void);
#endif /* !vfm_h */
#endif /* !vfm_h */