From 53b4786037d8b040991eb7d2146ac11ebd8cb718 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Sun, 13 Jun 2021 21:41:07 +0200 Subject: Codechange: [Network] Let NetworkError return its std::string instead of a C-string --- src/network/core/os_abstraction.cpp | 4 ++-- src/network/core/os_abstraction.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/core/os_abstraction.cpp b/src/network/core/os_abstraction.cpp index b2d3475d0..202806a34 100644 --- a/src/network/core/os_abstraction.cpp +++ b/src/network/core/os_abstraction.cpp @@ -76,7 +76,7 @@ bool NetworkError::IsConnectInProgress() const * Get the string representation of the error message. * @return The string representation that will get overwritten by next calls. */ -const char *NetworkError::AsString() const +const std::string &NetworkError::AsString() const { if (this->message.empty()) { #if defined(_WIN32) @@ -97,7 +97,7 @@ const char *NetworkError::AsString() const this->message.assign(strerror(this->error)); #endif } - return this->message.c_str(); + return this->message; } /** diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h index 8cf820255..fbde92c05 100644 --- a/src/network/core/os_abstraction.h +++ b/src/network/core/os_abstraction.h @@ -29,7 +29,7 @@ public: bool WouldBlock() const; bool IsConnectionReset() const; bool IsConnectInProgress() const; - const char *AsString() const; + const std::string &AsString() const; static NetworkError GetLast(); }; -- cgit v1.2.3-54-g00ecf