Skip to content

GitLab

Commit 67c8f846 authored by Sandrine Avakian's avatar Sandrine Avakian
Browse files

linphone-daemon readPipe bugfix

parent f74e37be
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
daemon/daemon.cc
View file @ 67c8f846
...@@ -679,7 +679,7 @@ string Daemon::readPipe() { ...@@ -679,7 +679,7 @@ string Daemon::readPipe() {
close(childfd); close(childfd);
} else { } else {
mChildFd = (ortp_pipe_t)childfd; mChildFd = (ortp_pipe_t)childfd;
return NULL; return "";
} }
} }
} }
...@@ -692,7 +692,7 @@ string Daemon::readPipe() { ...@@ -692,7 +692,7 @@ string Daemon::readPipe() {
ms_message("Client disconnected"); ms_message("Client disconnected");
ortp_server_pipe_close_client(mChildFd); ortp_server_pipe_close_client(mChildFd);
mChildFd = (ortp_pipe_t)-1; mChildFd = (ortp_pipe_t)-1;
return NULL; return "";
} }
buffer[ret] = '\0'; buffer[ret] = '\0';
return buffer; return buffer;
...@@ -700,7 +700,7 @@ string Daemon::readPipe() { ...@@ -700,7 +700,7 @@ string Daemon::readPipe() {
} }
} }
#endif #endif
return NULL; return "";
} }
void Daemon::dumpCommandsHelp() { void Daemon::dumpCommandsHelp() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment