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

4
repos/os/src/server/lx_fs/directory.h
View File

@ -133,12 +133,12 @@ class File_system::Directory : public Node
size_t read(char *dst, size_t len, seek_off_t seek_offset)
{
if (len < sizeof(Directory_entry)) {
PERR("read buffer too small for directory entry");
Genode::error("read buffer too small for directory entry");
return 0;
}
if (seek_offset % sizeof(Directory_entry)) {
PERR("seek offset not aligned to sizeof(Directory_entry)");
Genode::error("seek offset not aligned to sizeof(Directory_entry)");
return 0;
}

33
repos/os/src/server/lx_fs/main.cc
View File

@ -12,6 +12,7 @@
*/
/* Genode includes */
#include <base/heap.h>
#include <file_system/node_handle_registry.h>
#include <file_system_session/rpc_object.h>
#include <root/component.h>
@ -96,7 +97,7 @@ class File_system::Session_component : public Session_rpc_object
_process_packet_op(packet, *node);
}
catch (Invalid_handle) { PERR("Invalid_handle"); }
catch (Invalid_handle) { Genode::error("Invalid_handle"); }
/*
* The 'acknowledge_packet' function cannot block because we
@ -138,7 +139,7 @@ class File_system::Session_component : public Session_rpc_object
static void _assert_valid_path(char const *path)
{
if (!path || path[0] != '/') {
PWRN("malformed path '%s'", path);
Genode::warning("malformed path '", path, "'");
throw Lookup_failed();
}
}
@ -204,7 +205,7 @@ class File_system::Session_component : public Session_rpc_object
Symlink_handle symlink(Dir_handle dir_handle, Name const &name, bool create)
{
PERR("%s not implemented", __func__);
Genode::error(__func__, " not implemented");
return Symlink_handle();
}
@ -270,19 +271,19 @@ class File_system::Session_component : public Session_rpc_object
return s;
}
PERR("%s for symlinks not implemented", __func__);
Genode::error(__func__, " for symlinks not implemented");
return Status();
}
void control(Node_handle, Control)
{
PERR("%s not implemented", __func__);
Genode::error(__func__, " not implemented");
}
void unlink(Dir_handle, Name const &)
{
PERR("%s not implemented", __func__);
Genode::error(__func__, " not implemented");
}
void truncate(File_handle file_handle, file_size_t size)
@ -297,7 +298,7 @@ class File_system::Session_component : public Session_rpc_object
void move(Dir_handle, Name const &, Dir_handle, Name const &)
{
PERR("%s not implemented", __func__);
Genode::error(__func__, " not implemented");
}
void sigh(Node_handle node_handle, Signal_context_capability sigh)
@ -310,7 +311,7 @@ class File_system::Session_component : public Session_rpc_object
* reminder because besides testing, there is currently no
* use-case.
*/
void sync(Node_handle) override { PWRN("sync() not implemented!"); }
void sync(Node_handle) override { Genode::warning("sync() not implemented!"); }
};
@ -353,7 +354,8 @@ class File_system::Root : public Root_component<Session_component>
* lookup, we remove all leading slashes.
*/
if (root[0] != '/') {
PERR("Root directory must start with / but is \"%s\"", root);
Genode::error("Root directory must start with / but is \"",
Genode::Cstring(root), "\"");
throw Root::Unavailable();
}
@ -363,7 +365,7 @@ class File_system::Root : public Root_component<Session_component>
if (*root_dir == 0)
root_dir = ".";
} catch (Xml_node::Nonexistent_attribute) {
PERR("Missing \"root\" attribute in policy definition");
Genode::error("missing \"root\" attribute in policy definition");
throw Root::Unavailable();
}
@ -373,7 +375,7 @@ class File_system::Root : public Root_component<Session_component>
writeable = policy.attribute_value("writeable", false);
} catch (Session_policy::No_policy_defined) {
PERR("Invalid session request, no matching policy");
Genode::error("invalid session request, no matching policy");
throw Root::Unavailable();
}
@ -383,7 +385,7 @@ class File_system::Root : public Root_component<Session_component>
Arg_string::find_arg(args, "tx_buf_size").ulong_value(0);
if (!tx_buf_size) {
PERR("%s requested a session with a zero length transmission buffer", label.string());
Genode::error(label, " requested a session with a zero length transmission buffer");
throw Root::Invalid_args();
}
@ -393,8 +395,8 @@ class File_system::Root : public Root_component<Session_component>
*/
size_t session_size = sizeof(Session_component) + tx_buf_size;
if (max((size_t)4096, session_size) > ram_quota) {
PERR("insufficient 'ram_quota', got %zd, need %zd",
ram_quota, session_size);
Genode::error("insufficient 'ram_quota', "
"got ", ram_quota, ", need ", session_size);
throw Root::Quota_exceeded();
}
@ -402,7 +404,8 @@ class File_system::Root : public Root_component<Session_component>
return new (md_alloc())
Session_component(tx_buf_size, _ep, root_dir, writeable, *md_alloc());
} catch (Lookup_failed) {
PERR("Session root directory \"%s\" does not exist", root);
Genode::error("session root directory \"", Genode::Cstring(root), "\" "
"does not exist");
throw Root::Unavailable();
}
}