ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-18 23:28:29 +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

7
repos/demo/src/server/nitlog/main.cc
View File

@ -15,6 +15,7 @@
#include <base/env.h>
#include <base/sleep.h>
#include <base/lock.h>
#include <base/heap.h>
#include <base/snprintf.h>
#include <base/rpc_server.h>
#include <root/component.h>
@ -295,7 +296,7 @@ class Log_session_component : public Genode::Rpc_object<Genode::Log_session>
Genode::size_t write(String const &log_text)
{
if (!log_text.valid_string()) {
PERR("corrupted string");
Genode::error("corrupted string");
return 0;
}
@ -315,7 +316,7 @@ class Log_root_component : public Genode::Root_component<Log_session_component>
Log_session_component *_create_session(const char *args)
{
PINF("create log session (%s)", args);
Genode::log("create log session args: ", args);
char label_buf[Log_session_component::LABEL_LEN];
Genode::Arg label_arg = Genode::Arg_string::find_arg(args, "label");
@ -386,7 +387,7 @@ int main(int argc, char **argv)
using namespace Genode;
/* make sure that we connect to LOG before providing this service by ourself */
printf("--- nitlog ---\n");
log("--- nitlog ---");
/* calculate size of log view in pixels */
int log_win_w = default_font.str_w(" ") * LOG_W + 2;