mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-14 13:18:19 +00:00
base: avoid use of deprecated base/printf.h
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
This commit is contained in:
committed by
Christian Helmuth
parent
a5d3aa8373
commit
17c79a9e23
@ -105,7 +105,7 @@ class Genode::Xml_attribute
|
||||
|
||||
typedef String<64> Name;
|
||||
Name name() const {
|
||||
return Name(_name.start(), _name.len()); }
|
||||
return Name(Cstring(_name.start(), _name.len())); }
|
||||
|
||||
/**
|
||||
* Return true if attribute has specified type
|
||||
@ -171,7 +171,7 @@ class Genode::Xml_attribute
|
||||
{
|
||||
char buf[N];
|
||||
value(buf, sizeof(buf));
|
||||
*out = String<N>(buf);
|
||||
*out = String<N>(Cstring(buf));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -599,7 +599,7 @@ class Genode::Xml_node
|
||||
Type type() const
|
||||
{
|
||||
Token name = _start_tag.name();
|
||||
return Type(name.start(), name.len());
|
||||
return Type(Cstring(name.start(), name.len()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -705,7 +705,7 @@ class Genode::Xml_node
|
||||
char buf[STRING::capacity() + 1];
|
||||
size_t const len = decoded_content(buf, sizeof(buf));
|
||||
buf[min(len, STRING::capacity())] = 0;
|
||||
return STRING(buf);
|
||||
return STRING(Cstring(buf));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user