mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-17 06:38:28 +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
@ -319,7 +319,7 @@ struct Io_memory : public Bus_space
|
||||
|
||||
int Bsd::probe_drivers(Genode::Env &env, Genode::Allocator &alloc)
|
||||
{
|
||||
PINF("--- probe drivers ---");
|
||||
Genode::log("--- probe drivers ---");
|
||||
static Pci_driver drv(env, alloc);
|
||||
return drv.probe();
|
||||
}
|
||||
@ -529,8 +529,8 @@ extern "C" int bus_dmamap_load(bus_dma_tag_t tag, bus_dmamap_t dmam, void *buf,
|
||||
|
||||
extern "C" void bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t)
|
||||
{
|
||||
Genode::log("not implemented, called from ",
|
||||
__builtin_return_address(0));
|
||||
Genode::warning("not implemented, called from ",
|
||||
__builtin_return_address(0));
|
||||
}
|
||||
|
||||
|
||||
@ -590,7 +590,7 @@ extern "C" void bus_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t) { }
|
||||
extern "C" paddr_t bus_dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *,
|
||||
int, off_t, int, int)
|
||||
{
|
||||
Genode::log("not implemented, called from ",
|
||||
__builtin_return_address(0));
|
||||
Genode::warning("not implemented, called from ",
|
||||
__builtin_return_address(0));
|
||||
return 0;
|
||||
}
|
||||
|
@ -25,14 +25,14 @@ enum {
|
||||
#define DUMMY(retval, name) \
|
||||
DUMMY name(void) { \
|
||||
if (SHOW_DUMMY) \
|
||||
Genode::log( #name " called (from ", __builtin_return_address(0), ") not implemented"); \
|
||||
Genode::warning( #name " called (from ", __builtin_return_address(0), ") not implemented"); \
|
||||
return retval; \
|
||||
}
|
||||
|
||||
#define DUMMY_SKIP(retval, name) \
|
||||
DUMMY name(void) { \
|
||||
if (SHOW_SKIP) \
|
||||
Genode::log( #name " called (from ", __builtin_return_address(0), ") skipped"); \
|
||||
Genode::warning( #name " called (from ", __builtin_return_address(0), ") skipped"); \
|
||||
return retval; \
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user