navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/builtin.c: remove unnecessary jv_copy-s in type_error/type_error2

Browse Source 
Also fix doubled semicolon   jv ret;;   =>   jv ret;
This commit is contained in:
Emanuele Torre authored and Nico Williams committed 2023-10-30 22:12:27 -05:00
1 parent d5590f90da
commit f4929f3c19
1 file changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/builtin.c
+10 -11
View File
@@ -58,24 +58,23 @@ BINOPS
static jv type_error(jv bad, const char* msg) { static jv type_error(jv bad, const char* msg) {
char errbuf[15]; char errbuf[15];
jv err = jv_invalid_with_msg(jv_string_fmt("%s (%s) %s", const char *badkind = jv_kind_name(jv_get_kind(bad));
jv_kind_name(jv_get_kind(bad)), jv err = jv_invalid_with_msg(jv_string_fmt("%s (%s) %s", badkind,
jv_dump_string_trunc(jv_copy(bad), errbuf, sizeof(errbuf)), jv_dump_string_trunc(bad, errbuf, sizeof(errbuf)),
msg)); msg));
jv_free(bad);
return err; return err;
} }
static jv type_error2(jv bad1, jv bad2, const char* msg) { static jv type_error2(jv bad1, jv bad2, const char* msg) {
char errbuf1[15],errbuf2[15]; char errbuf1[15],errbuf2[15];
const char *badkind1 = jv_kind_name(jv_get_kind(bad1));
const char *badkind2 = jv_kind_name(jv_get_kind(bad2));
jv err = jv_invalid_with_msg(jv_string_fmt("%s (%s) and %s (%s) %s", jv err = jv_invalid_with_msg(jv_string_fmt("%s (%s) and %s (%s) %s",
jv_kind_name(jv_get_kind(bad1)), badkind1,
jv_dump_string_trunc(jv_copy(bad1), errbuf1, sizeof(errbuf1)), jv_dump_string_trunc(bad1, errbuf1, sizeof(errbuf1)),
jv_kind_name(jv_get_kind(bad2)), badkind2,
jv_dump_string_trunc(jv_copy(bad2), errbuf2, sizeof(errbuf2)), jv_dump_string_trunc(bad2, errbuf2, sizeof(errbuf2)),
msg)); msg));
jv_free(bad1);
jv_free(bad2);
return err; return err;
} }
@@ -283,7 +282,7 @@ static jv f_endswith(jq_state *jq, jv a, jv b) {
const char *bstr = jv_string_value(b); const char *bstr = jv_string_value(b);
size_t alen = jv_string_length_bytes(jv_copy(a)); size_t alen = jv_string_length_bytes(jv_copy(a));
size_t blen = jv_string_length_bytes(jv_copy(b)); size_t blen = jv_string_length_bytes(jv_copy(b));
jv ret;; jv ret;
if (alen < blen || if (alen < blen ||
memcmp(astr + (alen - blen), bstr, blen) != 0) memcmp(astr + (alen - blen), bstr, blen) != 0)