From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
A string that contains '\0' can be written as a list of strings e.g.
clock-names = "di0_pll\0di1_pll\0di0_sel\0di1_sel\0di2_sel\0di3_sel\0di0\0di1";
is equivalent to
clock-names = "di0_pll", "di1_pll", "di0_sel", "di1_sel", "di2_sel", "di3_sel", "di0", "di1";
The latter is easier to read, to use this format instead.
Two test files are adapted accordingly to keep the test suite happy.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
---
Changes since (implicit) v1, sent with Message-Id:
20230426182405.572729-1-u.kleine-koenig@xxxxxxxxxxxxxx:
- Adapt the test suite
tests/type-preservation.dt.yaml | 2 +-
tests/type-preservation.dts | 2 +-
treesource.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/type-preservation.dt.yaml b/tests/type-preservation.dt.yaml
index a0cc64cc4b69..e238d395aa02 100644
--- a/tests/type-preservation.dt.yaml
+++ b/tests/type-preservation.dt.yaml
@@ -12,7 +12,7 @@
int16-matrix: [!u16 [0x1234, 0x5678], [0x90ab, 0xcdef]]
int64: [!u64 [0x200000000]]
int64-array: [!u64 [0x100000000, 0x0]]
- a-string-with-nulls: ["foo\0bar", "baz"]
+ a-string-array: ["foo", "bar", "baz"]
a-phandle: [[!phandle 0x1]]
a-phandle-with-args: [[!phandle 0x1, 0x0, 0x1], [!phandle 0x1, 0x2, 0x3]]
subsubnode:
diff --git a/tests/type-preservation.dts b/tests/type-preservation.dts
index 921ea21172d1..443424dc28ec 100644
--- a/tests/type-preservation.dts
+++ b/tests/type-preservation.dts
@@ -15,7 +15,7 @@
int16-matrix = /bits/ 16 <0x1234 0x5678>, <0x90ab 0xcdef>;
int64 = /bits/ 64 <0x200000000>;
int64-array = /bits/ 64 <0x100000000 0x00> int64_array_label_end:;
- a-string-with-nulls = "foo\0bar", "baz";
+ a-string-array = "foo", "bar", "baz";
a-phandle = <&subsub1>;
a-phandle-with-args = <&subsub1 0x00 0x01>, <&subsub1 0x02 0x03>;
diff --git a/treesource.c b/treesource.c
index 33fedee82d58..de30188189fb 100644
--- a/treesource.c
+++ b/treesource.c
@@ -87,7 +87,7 @@ static void write_propval_string(FILE *f, const char *s, size_t len)
fprintf(f, "\\\"");
break;
case '\0':
- fprintf(f, "\\0");
+ fprintf(f, "\", \"");
break;
default:
if (isprint((unsigned char)c))
--
2.39.2
