From 10514e96541e034a4e57b4dde3ff81e431602b41 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 15 Dec 2015 21:33:44 -0500 Subject: [PATCH] DSL string-reference iterate --- c/containers/mlrval.c | 1 + doc/file-formats.html | 16 ++-------------- doc/mlr.1.premade | 4 ++-- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/c/containers/mlrval.c b/c/containers/mlrval.c index e01afece9..333c56fb7 100644 --- a/c/containers/mlrval.c +++ b/c/containers/mlrval.c @@ -131,6 +131,7 @@ char* mv_describe_val(mv_t val) { char* strv = mv_alloc_format_val(&val); char* desc = mlr_malloc_or_die(strlen(stype) + strlen(strv) + 4); sprintf(desc, "[%s] %s", stype, strv); + free(strv); return desc; } diff --git a/doc/file-formats.html b/doc/file-formats.html index e556b024d..c6f88e03c 100644 --- a/doc/file-formats.html +++ b/doc/file-formats.html @@ -213,13 +213,7 @@ puts "host=#{hostname},seconds=#{t2-t1},message=#{msg}"

-

-

-
-puts mymap.collect{|k,v| "#{k}=#{v}"}.join(',')
-
-
-

+POKI_CARDIFY(puts mymap.collect{|k,v| "#{k}=#{v}"}.join(','))HERE or print statements in various languages, e.g.

@@ -228,13 +222,7 @@ echo "type=3,user=$USER,date=$date\n";

-

-

-
-logger.log("type=3,user=$USER,date=$date\n");
-
-
-

+POKI_CARDIFY(logger.log("type=3,user=$USER,date=$date\n");)HERE

Fields lacking an IPS will have positional index (starting at 1) used as the key, as in NIDX format. For example, dish=7,egg=8,flint is parsed diff --git a/doc/mlr.1.premade b/doc/mlr.1.premade index 041b5cf5c..046af302b 100644 --- a/doc/mlr.1.premade +++ b/doc/mlr.1.premade @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2015-12-14 +.\" Date: 2015-12-16 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2015-12-14" "\ \&" "\ \&" +.TH "MILLER" "1" "2015-12-16" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~