ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-21 00:23:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: avoid use of deprecated base/printf.h

Browse Source 
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:
Norman Feske
2016-07-13 19:07:09 +02:00
committed by Christian Helmuth
parent a5d3aa8373
commit 17c79a9e23
699 changed files with 5156 additions and 5865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/src/server/log_terminal/main.cc
View File

@ -12,6 +12,7 @@
*/
/* Genode includes */
#include <base/heap.h>
#include <root/component.h>
#include <os/server.h>
#include <os/attached_ram_dataspace.h>
@ -50,7 +51,7 @@ class Buffered_output
_buf[_index] = 0;
/* flush buffered characters to LOG */
Genode::printf(_buf);
Genode::log(Genode::Cstring(_buf));
/* reset */
_index = 0;
@ -67,9 +68,10 @@ class Buffered_output
for (unsigned i = 0; i < consume_bytes; i++) {
char const c = src[i];
_buf[_index++] = c;
if (c == '\n')
_flush();
else
_buf[_index++] = c;
}
if (_remaining_capacity() == 0)