RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:27:35 +00:00
Code Issues Activity Actions

LibCore: Using printf() inside CIODevices will now call CIODevice::printf().

Browse source 
Well this was confusing. Obviously this code should never be calling outside
to ::printf() anyway, so just use dbgprintf() instead.
This commit is contained in:
Andreas Kling 2019-05-10 18:20:54 +02:00
parent 090e14d42c
commit dbf7878998
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
LibCore/CIODevice.cpp
View file

@ -118,7 +118,7 @@ ByteBuffer CIODevice::read_line(int max_size)
return { };
if (m_eof) {
if (m_buffered_data.size() > max_size) {
printf("CIODevice::read_line: At EOF but there's more than max_size(%d) buffered\n", max_size);
dbgprintf("CIODevice::read_line: At EOF but there's more than max_size(%d) buffered\n", max_size);
return { };
}
auto buffer = ByteBuffer::copy(m_buffered_data.data(), m_buffered_data.size());
@ -203,7 +203,9 @@ int CIODevice::printf(const char* format, ...)
va_start(ap, format);
// FIXME: We're not propagating write() failures to client here!
int ret = printf_internal([this] (char*&, char ch) {
write((const byte*)&ch, 1);
int rc = write((const byte*)&ch, 1);
if (rc < 0)
dbgprintf("CIODevice::printf: write: %s\n", strerror(errno));
}, nullptr, format, ap);
va_end(ap);
return ret;