diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2020-06-23 11:43:43 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-06-24 16:11:55 +1000 |
| commit | 9d7888cbf19c2930992844e69a097dc71e5a7354 (patch) | |
| tree | a4abf744ea5ebed91eaff976e9ecbfdd1c57b8cb /treesource.c | |
| parent | 8259d59f59def85194bd71e855176a3b2ef8702f (diff) | |
| download | device-tree-compiler-9d7888cbf19c2930992844e69a097dc71e5a7354.tar.gz | |
dtc: Consider one-character strings as strings
When using overlays, a target-path property pointing to the root node is
quite common. However, "dtc -O dts" prints it as a byte array:
target-path = [2f 00];
instead of a string:
target-path = "/";
For guess_value_type() to consider a value to be a string, it must
contain less nul bytes than non-nul bytes, thus ruling out strings
containing only a single character. Allow printing such strings by
relaxing the condition slightly.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Message-Id: <20200623094343.26010-1-geert+renesas@glider.be>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'treesource.c')
| -rw-r--r-- | treesource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/treesource.c b/treesource.c index 2acb920..061ba8c 100644 --- a/treesource.c +++ b/treesource.c @@ -183,7 +183,7 @@ static enum markertype guess_value_type(struct property *prop) nnotcelllbl++; } - if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul < (len-nnul)) + if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul <= (len-nnul)) && (nnotstringlbl == 0)) { return TYPE_STRING; } else if (((len % sizeof(cell_t)) == 0) && (nnotcelllbl == 0)) { |