From a50e548cc5313c187483bc8fb1b95e1798e8ef65 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Thu, 21 May 2015 18:20:05 -0500 Subject: [PATCH] Fix error message for @tsv --- builtin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin.c b/builtin.c index 4747f618..8ea8319c 100644 --- a/builtin.c +++ b/builtin.c @@ -375,11 +375,14 @@ static jv f_format(jq_state *jq, jv input, jv fmt) { return f_tostring(jq, input); } else if (!strcmp(fmt_s, "csv") || !strcmp(fmt_s, "tsv")) { const char *quotes, *sep, *escapings; + const char *msg; if (!strcmp(fmt_s, "csv")) { + msg = "cannot be csv-formatted, only array"; quotes = "\""; sep = ","; escapings = "\"\"\"\0"; } else { + msg = "cannot be tsv-formatted, only array"; assert(!strcmp(fmt_s, "tsv")); quotes = ""; sep = "\t"; @@ -387,7 +390,7 @@ static jv f_format(jq_state *jq, jv input, jv fmt) { } jv_free(fmt); if (jv_get_kind(input) != JV_KIND_ARRAY) - return type_error(input, "cannot be csv-formatted, only array"); + return type_error(input, msg); jv line = jv_string(""); jv_array_foreach(input, i, x) { if (i) line = jv_string_append_str(line, sep);