projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dictionary: Avoid name shadowing in dict_clone().
[pspp]
/
src
/
data
/
casereader.h
diff --git
a/src/data/casereader.h
b/src/data/casereader.h
index 680e669928331a6ffccea5f72c4392e499f3b825..06f7a7b13a2cf872644cc9b8fc62d23c291ad3d1 100644
(file)
--- a/
src/data/casereader.h
+++ b/
src/data/casereader.h
@@
-67,8
+67,8
@@
struct casereader *casereader_clone (const struct casereader *);
struct casereader *casereader_rename (struct casereader *);
void casereader_swap (struct casereader *, struct casereader *);
struct casereader *casereader_rename (struct casereader *);
void casereader_swap (struct casereader *, struct casereader *);
-struct ccase *casereader_peek (struct casereader *, casenumber);
-bool casereader_is_empty (struct casereader *);
+struct ccase *casereader_peek (
const
struct casereader *, casenumber);
+bool casereader_is_empty (
const
struct casereader *);
bool casereader_error (const struct casereader *);
void casereader_force_error (struct casereader *);
bool casereader_error (const struct casereader *);
void casereader_force_error (struct casereader *);
@@
-107,21
+107,20
@@
struct casereader *
casereader_create_counter (struct casereader *, casenumber *counter,
casenumber initial_value);
casereader_create_counter (struct casereader *, casenumber *counter,
casenumber initial_value);
+struct casereader_translator_class
+ {
+ struct ccase *(*translate) (struct ccase *, void *aux);
+ bool (*destroy) (void *aux);
+ };
struct casereader *
casereader_create_translator (struct casereader *,
const struct caseproto *output_proto,
struct casereader *
casereader_create_translator (struct casereader *,
const struct caseproto *output_proto,
- struct ccase *(*translate) (struct ccase *,
- void *aux),
- bool (*destroy) (void *aux),
+ const struct casereader_translator_class *,
void *aux);
void *aux);
-
struct casereader *
casereader_translate_stateless (struct casereader *,
const struct caseproto *output_proto,
struct casereader *
casereader_translate_stateless (struct casereader *,
const struct caseproto *output_proto,
- struct ccase *(*translate) (struct ccase *,
- casenumber idx,
- const void *aux),
- bool (*destroy) (void *aux),
+ const struct casereader_translator_class *,
void *aux);
struct casereader *casereader_project (struct casereader *,
void *aux);
struct casereader *casereader_project (struct casereader *,