From 02bac03162280236ef7a33993358cb7dcff443d1 Mon Sep 17 00:00:00 2001 From: Florent Revest Date: Wed, 21 Jan 2026 15:38:10 +0100 Subject: tools/clang/json: escape strings properly When preparing a codesearch index, I encountered errors which I narrowed down to lines like the following in the json output of codesearch: "type": "void (void __attribute__((btf_type_tag("user")))*, const void *, size_t, size_t)", After this change, the line gets formatted like this: "type": "void (void __attribute__((btf_type_tag(\"user\")))*, const void *, size_t, size_t)", This fixes the errors I encountered --- pkg/codesearch/testdata/source0.c.json | 51 +++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-) (limited to 'pkg/codesearch/testdata/source0.c.json') diff --git a/pkg/codesearch/testdata/source0.c.json b/pkg/codesearch/testdata/source0.c.json index c2c2de3e4..5d347ae1b 100644 --- a/pkg/codesearch/testdata/source0.c.json +++ b/pkg/codesearch/testdata/source0.c.json @@ -1,15 +1,5 @@ { "definitions": [ - { - "name": "some_enum", - "kind": "enum", - "body": { - "file": "source0.h", - "start_line": 45, - "end_line": 48 - }, - "comment": {} - }, { "name": "close", "type": "int ()", @@ -89,6 +79,17 @@ } ] }, + { + "name": "function_with_quotes_in_type", + "type": "void (void __attribute__((btf_type_tag(\"user\")))*)", + "kind": "function", + "body": { + "file": "source0.c", + "start_line": 35, + "end_line": 37 + }, + "comment": {} + }, { "name": "open", "type": "int ()", @@ -148,6 +149,26 @@ }, "comment": {} }, + { + "name": "some_union", + "kind": "union", + "body": { + "file": "source0.h", + "start_line": 40, + "end_line": 43 + }, + "comment": {} + }, + { + "name": "some_enum", + "kind": "enum", + "body": { + "file": "source0.h", + "start_line": 45, + "end_line": 48 + }, + "comment": {} + }, { "name": "another_struct_t", "kind": "typedef", @@ -187,16 +208,6 @@ "end_line": 34 }, "comment": {} - }, - { - "name": "some_union", - "kind": "union", - "body": { - "file": "source0.h", - "start_line": 40, - "end_line": 43 - }, - "comment": {} } ] } \ No newline at end of file -- cgit mrf-deployment