From 5b77eb214ab4a5bb35a3d2da2aa88ce042edc5ed Mon Sep 17 00:00:00 2001 From: John Kerl Date: Mon, 15 Jun 2015 18:26:43 -0400 Subject: [PATCH] iterate on stdio/mmap lrec-reader abstraction --- c/input/lrec_reader_mmap.h | 2 +- c/input/lrec_reader_mmap_csv.c | 3 ++- c/input/lrec_reader_mmap_dkvp.c | 3 ++- c/input/lrec_reader_mmap_nidx.c | 3 ++- c/input/lrec_reader_mmap_xtab.c | 3 ++- c/input/lrec_reader_stdio.h | 2 +- c/input/lrec_reader_stdio_csv.c | 3 ++- c/input/lrec_reader_stdio_dkvp.c | 3 ++- c/input/lrec_reader_stdio_nidx.c | 3 ++- c/input/lrec_reader_stdio_xtab.c | 3 ++- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/c/input/lrec_reader_mmap.h b/c/input/lrec_reader_mmap.h index c7b0d87d7..834a1dd4d 100644 --- a/c/input/lrec_reader_mmap.h +++ b/c/input/lrec_reader_mmap.h @@ -6,7 +6,7 @@ #include "mapping/context.h" #include "input/file_reader_mmap.h" -typedef lrec_t* lrec_reader_mmap_process_func_t(file_reader_mmap_state_t* pfh, void* pvstate, context_t* pctx); +typedef lrec_t* lrec_reader_mmap_process_func_t(void* pvhandle, void* pvstate, context_t* pctx); typedef void lrec_reader_mmap_sof_func_t(void* pvstate); typedef struct _lrec_reader_mmap_t { diff --git a/c/input/lrec_reader_mmap_csv.c b/c/input/lrec_reader_mmap_csv.c index aa8f4d7a3..931a0164a 100644 --- a/c/input/lrec_reader_mmap_csv.c +++ b/c/input/lrec_reader_mmap_csv.c @@ -151,7 +151,8 @@ static lrec_t* lrec_reader_mmap_csv_get_record(file_reader_mmap_state_t* phandle return prec; } -static lrec_t* lrec_reader_mmap_csv_process(file_reader_mmap_state_t* phandle, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_mmap_csv_process(void* pvhandle, void* pvstate, context_t* pctx) { + file_reader_mmap_state_t* phandle = pvhandle; lrec_reader_mmap_csv_state_t* pstate = pvstate; while (TRUE) { diff --git a/c/input/lrec_reader_mmap_dkvp.c b/c/input/lrec_reader_mmap_dkvp.c index 1434b2495..a1c4b3056 100644 --- a/c/input/lrec_reader_mmap_dkvp.c +++ b/c/input/lrec_reader_mmap_dkvp.c @@ -12,7 +12,8 @@ typedef struct _lrec_reader_mmap_dkvp_state_t { } lrec_reader_mmap_dkvp_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_mmap_dkvp_process(file_reader_mmap_state_t* phandle, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_mmap_dkvp_process(void* pvhandle, void* pvstate, context_t* pctx) { + file_reader_mmap_state_t* phandle = pvhandle; lrec_reader_mmap_dkvp_state_t* pstate = pvstate; if (phandle->sol >= phandle->eof) // xxx encapsulate a method for this ... return NULL; diff --git a/c/input/lrec_reader_mmap_nidx.c b/c/input/lrec_reader_mmap_nidx.c index 4658bcd5b..e71ddc2e5 100644 --- a/c/input/lrec_reader_mmap_nidx.c +++ b/c/input/lrec_reader_mmap_nidx.c @@ -10,7 +10,8 @@ typedef struct _lrec_reader_mmap_nidx_state_t { } lrec_reader_mmap_nidx_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_mmap_nidx_process(file_reader_mmap_state_t* phandle, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_mmap_nidx_process(void* pvhandle, void* pvstate, context_t* pctx) { + file_reader_mmap_state_t* phandle = pvhandle; lrec_reader_mmap_nidx_state_t* pstate = pvstate; if (phandle->sol >= phandle->eof) // xxx encapsulate a method for this ... return NULL; diff --git a/c/input/lrec_reader_mmap_xtab.c b/c/input/lrec_reader_mmap_xtab.c index e420c0669..da9626591 100644 --- a/c/input/lrec_reader_mmap_xtab.c +++ b/c/input/lrec_reader_mmap_xtab.c @@ -11,7 +11,8 @@ typedef struct _lrec_reader_mmap_xtab_state_t { } lrec_reader_mmap_xtab_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_mmap_xtab_process(file_reader_mmap_state_t* phandle, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_mmap_xtab_process(void* pvhandle, void* pvstate, context_t* pctx) { + file_reader_mmap_state_t* phandle = pvhandle; lrec_reader_mmap_xtab_state_t* pstate = pvstate; if (phandle->sol >= phandle->eof) diff --git a/c/input/lrec_reader_stdio.h b/c/input/lrec_reader_stdio.h index 4b2bed287..cb7525584 100644 --- a/c/input/lrec_reader_stdio.h +++ b/c/input/lrec_reader_stdio.h @@ -5,7 +5,7 @@ #include "containers/lrec.h" #include "mapping/context.h" -typedef lrec_t* lrec_reader_stdio_process_func_t(FILE* fp, void* pvstate, context_t* pctx); +typedef lrec_t* lrec_reader_stdio_process_func_t(void* pvhandle, void* pvstate, context_t* pctx); typedef void lrec_reader_stdio_sof_func_t(void* pvstate); typedef void lrec_reader_stdio_free_func_t(void* pvstate); diff --git a/c/input/lrec_reader_stdio_csv.c b/c/input/lrec_reader_stdio_csv.c index 4915ef7fc..3670fdd90 100644 --- a/c/input/lrec_reader_stdio_csv.c +++ b/c/input/lrec_reader_stdio_csv.c @@ -50,7 +50,8 @@ typedef struct _lrec_reader_stdio_csv_state_t { // // etc. -static lrec_t* lrec_reader_stdio_csv_process(FILE* input_stream, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_stdio_csv_process(void* pvhandle, void* pvstate, context_t* pctx) { + FILE* input_stream = pvhandle; lrec_reader_stdio_csv_state_t* pstate = pvstate; while (TRUE) { diff --git a/c/input/lrec_reader_stdio_dkvp.c b/c/input/lrec_reader_stdio_dkvp.c index 68a585094..74c0cc4e1 100644 --- a/c/input/lrec_reader_stdio_dkvp.c +++ b/c/input/lrec_reader_stdio_dkvp.c @@ -11,7 +11,8 @@ typedef struct _lrec_reader_stdio_dkvp_state_t { } lrec_reader_stdio_dkvp_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_stdio_dkvp_process(FILE* input_stream, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_stdio_dkvp_process(void* pvhandle, void* pvstate, context_t* pctx) { + FILE* input_stream = pvhandle; lrec_reader_stdio_dkvp_state_t* pstate = pvstate; char* line = mlr_get_line(input_stream, pstate->irs); diff --git a/c/input/lrec_reader_stdio_nidx.c b/c/input/lrec_reader_stdio_nidx.c index 0049b5090..638c29e5f 100644 --- a/c/input/lrec_reader_stdio_nidx.c +++ b/c/input/lrec_reader_stdio_nidx.c @@ -9,7 +9,8 @@ typedef struct _lrec_reader_stdio_nidx_state_t { } lrec_reader_stdio_nidx_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_stdio_nidx_process(FILE* input_stream, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_stdio_nidx_process(void* pvhandle, void* pvstate, context_t* pctx) { + FILE* input_stream = pvhandle; lrec_reader_stdio_nidx_state_t* pstate = pvstate; char* line = mlr_get_line(input_stream, pstate->irs); if (line == NULL) diff --git a/c/input/lrec_reader_stdio_xtab.c b/c/input/lrec_reader_stdio_xtab.c index 07fa15a67..da40221bc 100644 --- a/c/input/lrec_reader_stdio_xtab.c +++ b/c/input/lrec_reader_stdio_xtab.c @@ -10,7 +10,8 @@ typedef struct _lrec_reader_stdio_xtab_state_t { } lrec_reader_stdio_xtab_state_t; // ---------------------------------------------------------------- -static lrec_t* lrec_reader_stdio_xtab_process(FILE* input_stream, void* pvstate, context_t* pctx) { +static lrec_t* lrec_reader_stdio_xtab_process(void* pvhandle, void* pvstate, context_t* pctx) { + FILE* input_stream = pvhandle; lrec_reader_stdio_xtab_state_t* pstate = pvstate; if (pstate->at_eof)