oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/BufferedSocket: pass writable pointer to OnSocketInput()

Browse Source 
Remove the const_cast from HttpdClient.cxx, and avoid one allocation
in ClientRead.cxx.
This commit is contained in:
Max Kellermann
2013-10-15 22:18:37 +02:00
parent 509f8dab89
commit 12ab556477
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/output/HttpdClient.cxx
View File

@@ -402,7 +402,7 @@ HttpdClient::OnSocketReady(unsigned flags)
}
BufferedSocket::InputResult
HttpdClient::OnSocketInput(const void *data, size_t length)
HttpdClient::OnSocketInput(void *data, size_t length)
{
if (state == RESPONSE) {
LogWarning(httpd_output_domain,
@@ -411,8 +411,8 @@ HttpdClient::OnSocketInput(const void *data, size_t length)
return InputResult::CLOSED;
}
const char *line = (const char *)data;
const char *newline = (const char *)memchr(line, '\n', length);
char *line = (char *)data;
char *newline = (char *)memchr(line, '\n', length);
if (newline == nullptr)
return InputResult::MORE;
@@ -421,9 +421,8 @@ HttpdClient::OnSocketInput(const void *data, size_t length)
if (newline > line && newline[-1] == '\r')
--newline;
/* terminate the string at the end of the line; the const_cast
is a dirty hack */
*const_cast<char *>(newline) = 0;
/* terminate the string at the end of the line */
*newline = 0;
if (!HandleLine(line)) {
assert(state == RESPONSE);