mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-19 15:43:56 +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
@ -89,7 +89,7 @@ void Rom_to_file::Main::_handle_update(unsigned)
|
||||
rom_name = config()->xml_node().attribute_value("rom", rom_name);
|
||||
|
||||
} catch (...) {
|
||||
PWRN("could not determine ROM name from config");
|
||||
warning("could not determine ROM name from config");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -127,31 +127,31 @@ void Rom_to_file::Main::_handle_update(unsigned)
|
||||
size_t written = write(_fs, handle, _rom_ds->local_addr<void>(), len, 0);
|
||||
|
||||
if (written < len) {
|
||||
PWRN("%zu of %zu bytes have been written", written, len);
|
||||
warning(written, " of ", len, " bytes have been written");
|
||||
}
|
||||
|
||||
_fs.close(handle);
|
||||
} catch (Permission_denied) {
|
||||
PERR("%s%s: permission denied", dir_path, file_name);
|
||||
error(Cstring(dir_path), file_name, ": permission denied");
|
||||
|
||||
} catch (No_space) {
|
||||
PERR("file system out of space");
|
||||
error("file system out of space");
|
||||
|
||||
} catch (Out_of_metadata) {
|
||||
PERR("server ran out of memory");
|
||||
error("server ran out of memory");
|
||||
|
||||
} catch (Invalid_name) {
|
||||
PERR("%s%s: invalid path", dir_path, file_name);
|
||||
error(Cstring(dir_path), file_name, ": invalid path");
|
||||
|
||||
} catch (Name_too_long) {
|
||||
PERR("%s%s: name too long", dir_path, file_name);
|
||||
error(Cstring(dir_path), file_name, ": name too long");
|
||||
|
||||
} catch (...) {
|
||||
PERR("cannot open file %s%s", dir_path, file_name);
|
||||
error("cannot open file ", Cstring(dir_path), file_name);
|
||||
throw;
|
||||
}
|
||||
} else {
|
||||
PLOG("ROM '%s' is invalid", _rom_name.string());
|
||||
log("ROM '", _rom_name, "' is invalid");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user