From 1e694fba151ca3cd9fd903c1204018fa63048dc4 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sun, 22 Jan 2017 22:02:51 -0500 Subject: [PATCH] neaten --- c/dsl/mlr_dsl_cst_map_assignment_statements.c | 1 - c/mapping/mapper_put_or_filter.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c/dsl/mlr_dsl_cst_map_assignment_statements.c b/c/dsl/mlr_dsl_cst_map_assignment_statements.c index 92e7b766d..756cb9ecd 100644 --- a/c/dsl/mlr_dsl_cst_map_assignment_statements.c +++ b/c/dsl/mlr_dsl_cst_map_assignment_statements.c @@ -112,7 +112,6 @@ static void handle_full_srec_assignment( } else { mlhmmv_xvalue_free(&boxed_xval.xval); } - // xxx needs a clear-and-move-all ... lrec_free(pvars->pinrec); lhmsmv_free(pvars->ptyped_overlay); pvars->pinrec = poutrec; diff --git a/c/mapping/mapper_put_or_filter.c b/c/mapping/mapper_put_or_filter.c index 543eecbc5..0e0c9e559 100644 --- a/c/mapping/mapper_put_or_filter.c +++ b/c/mapping/mapper_put_or_filter.c @@ -561,7 +561,7 @@ static sllv_t* mapper_put_or_filter_process(lrec_t* pinrec, context_t* pctx, voi should_emit_rec = TRUE; variables_t variables = (variables_t) { - .pinrec = pinrec, + .pinrec = pinrec, // Note variables.pinrec pointer can update on '$* = ...' .ptyped_overlay = ptyped_overlay, .poosvars = pstate->poosvars, .ppregex_captures = &pregex_captures, @@ -605,10 +605,11 @@ static sllv_t* mapper_put_or_filter_process(lrec_t* pinrec, context_t* pctx, voi lhmsmv_free(variables.ptyped_overlay); string_array_free(pregex_captures); + // Note variables.pinrec pointer can update on '$* = ...' if (should_emit_rec && !pstate->put_output_disabled) { sllv_append(poutrecs, variables.pinrec); } else { - lrec_free(variables.pinrec); // xxx variables.pinrec mess from reassign in #* = ... + lrec_free(variables.pinrec); } return poutrecs; }