From d46fa34869b9053d99920c5f1caebea2f4c18183 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 2 Sep 2020 17:22:30 +0300 Subject: [PATCH] Fix Linux CE. GitOrigin-RevId: 7758d3fe4cc16210338f739e2dcc748d55e808a5 --- tdutils/td/utils/port/detail/Epoll.cpp | 2 +- tdutils/td/utils/port/detail/EventFdBsd.cpp | 2 +- tdutils/td/utils/port/uname.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tdutils/td/utils/port/detail/Epoll.cpp b/tdutils/td/utils/port/detail/Epoll.cpp index e30b87336..d15eccfd6 100644 --- a/tdutils/td/utils/port/detail/Epoll.cpp +++ b/tdutils/td/utils/port/detail/Epoll.cpp @@ -112,7 +112,7 @@ void Epoll::run(int timeout_ms) { flags = flags | PollFlags::Error(); } if (event->events) { - LOG(FATAL) << "Unsupported epoll events: " << event->events; + LOG(FATAL) << "Unsupported epoll events: " << static_cast(event->events); } //LOG(DEBUG) << "Epoll event " << tag("fd", event->data.fd) << tag("flags", format::as_binary(flags)); auto pollable_fd = PollableFd::from_list_node(static_cast(event->data.ptr)); diff --git a/tdutils/td/utils/port/detail/EventFdBsd.cpp b/tdutils/td/utils/port/detail/EventFdBsd.cpp index 3544069d9..0eb9e5a84 100644 --- a/tdutils/td/utils/port/detail/EventFdBsd.cpp +++ b/tdutils/td/utils/port/detail/EventFdBsd.cpp @@ -77,7 +77,7 @@ void EventFdBsd::release() { } size_t size = result.ok(); if (size != sizeof(value)) { - LOG(FATAL) << "EventFdBsd write returned " << value << " instead of " << sizeof(value); + LOG(FATAL) << "EventFdBsd write returned " << size << " instead of " << sizeof(value); } } diff --git a/tdutils/td/utils/port/uname.cpp b/tdutils/td/utils/port/uname.cpp index 4a35b6897..ee0fde119 100644 --- a/tdutils/td/utils/port/uname.cpp +++ b/tdutils/td/utils/port/uname.cpp @@ -16,6 +16,8 @@ #if TD_PORT_POSIX +#include + #if TD_ANDROID #include #else @@ -99,7 +101,8 @@ Slice get_operating_system_version() { utsname name; int err = uname(&name); if (err == 0) { - auto os_name = trim(PSTRING() << name.sysname << " " << name.release); + auto os_name = trim(PSTRING() << Slice(name.sysname, std::strlen(name.sysname)) << " " + << Slice(name.release, std::strlen(name.release))); if (!os_name.empty()) { return os_name; }