d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more cleanups and bug fixes in dtc for property printing / parsing.

Browse Source 
Submitted by:	Patrick Wildt
This commit is contained in:
David Chisnall 2013-12-12 08:55:24 +00:00
parent ae893e1ad9
commit e00bea9e62
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/dtc/fdt.cc
View File

@ -137,7 +137,7 @@ property_value::resolve_type()
break; break;
} }
} }
if (is_all_printable && (bytes > nuls)) if ((is_all_printable && (bytes > nuls)) || bytes == 0)
{ {
type = STRING; type = STRING;
if (nuls > 0) if (nuls > 0)
@ -204,7 +204,7 @@ property_value::write_as_bytes(FILE *file)
putc('[', file); putc('[', file);
for (byte_buffer::iterator i=byte_data.begin(), e=byte_data.end(); i!=e ; i++) for (byte_buffer::iterator i=byte_data.begin(), e=byte_data.end(); i!=e ; i++)
{ {
fprintf(file, "%hhx", *i); fprintf(file, "%02hhx", *i);
if (i+1 != e) if (i+1 != e)
{ {
putc(' ', file); putc(' ', file);
@ -367,6 +367,11 @@ property::property(input_buffer &structs, input_buffer &strings)
return; return;
} }
key = string(name_buffer); key = string(name_buffer);
// If we're empty, do not push anything as value.
if (!length)
return;
// Read the value // Read the value
uint8_t byte; uint8_t byte;
property_value v; property_value v;